Commit Graph

468 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
30d3e45495 Updated submodules.
Change-Id: I7a10dca9ee8bc2158e9d211feb4005a29fb7b419
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-16 09:52:10 +02:00
Aaron McCarthy
4b497e1de4 Fix Qt Location dependencies.
Qt Location has a soft dependency on qtjsondb.

Declare a new soft dependency on qtsystems.  This dependency is
dependent on whether location shifting support for China is
enabled.  By default it is not.

Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-15 09:10:56 +02:00
Rohan McGovern
f1409e7b02 Updated submodules.
qtdeclarative was held back to omit
35dd4cbd3 "Remove QtDeclarative compatibility module", which causes some
regressions still pending fixes.

Change-Id: I47e8da3a178579ac4c05feb66db9cfafc0fe64d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-15 04:18:42 +02:00
Qt Submodule Update Bot
47e8da3a17 Updated submodules.
Change-Id: Iae16a14cf831b35bfc58a4b14f2bc109b27b6813
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-14 02:02:10 +02:00
Qt Submodule Update Bot
ae16a14cf8 Updated submodules.
Change-Id: Idf4acd4b44261fed883c456b77e442a4234aa746
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-13 05:30:21 +02:00
Qt Submodule Update Bot
df4acd4b44 Updated submodules.
Change-Id: I432843fa50648b25b3bc6f172068dfb5a23af937
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-12 00:38:12 +02:00
Simon Hausmann
5146b9449d Update WebKit to include QDeclarative* -> QQml* build fixes from Kent
Change-Id: Ie7a4018bed545a1e531b16fd163ff76fd73e3b3b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-05-11 17:23:39 +02:00
Friedemann Kleint
f40f4bb6d7 Remove dependency of qttools on qtscript from qt.pro.
The experimental scripting feature of QtUiLoader was removed.

Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-11 17:06:44 +02:00
Qt Submodule Update Bot
432843fa50 Updated submodules.
Change-Id: Ia4e416b1f43988378fe8d5e90c3fc6e724517176
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-10 21:08:58 +02:00
Simon Hausmann
e51fa873ca Updated WebKit to a new (building) snapshot
Change-Id: I741623aa5eb79f27f2be8a49e8e427e21eb6d546
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-05-07 17:50:59 +02:00
Qt Submodule Update Bot
a4e416b1f4 Updated submodules.
Change-Id: I0ab8650f7b5f700f5362eae4e652476d9b6801d1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-07 05:11:59 +02:00
Qt Submodule Update Bot
0ab8650f7b Updated submodules.
Change-Id: Ib77d8a94b6f66d212ce98f5b8847a8baa095371e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-06 01:55:13 +02:00
Qt Submodule Update Bot
b77d8a94b6 Updated submodules.
Change-Id: I10cd81046c17148437dccd87f3861c171cda6a6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-05 16:27:53 +02:00
Oswald Buddenhagen
09a7cd16d9 remove pointless $$IN_PWD/ prefixes on subdirs
Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-05 11:06:32 +02:00
Qt Submodule Update Bot
10cd81046c Updated submodules.
Change-Id: I88442f81edb4464cc88ac7c970333e7e59f1d200
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-04 21:33:36 +02:00
Qt Submodule Update Bot
88442f81ed Updated submodules.
Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-04 05:36:04 +02:00
Qt Submodule Update Bot
1968c54d4f Updated submodules.
Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-03 09:42:14 +02:00
Yuchen Deng
6d70a4f5cb Remove unnecessary rules for .gitignore
Change-Id: I07293521a4088593750f08a298160e9b476a9d73
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-24 15:20:08 +02:00
Marius Storm-Olsen
9894009117 Support the --continue option, ignoring build failures
Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 18:52:01 +02:00
Marius Storm-Olsen
dbf53d1ffb Follow -j [n] documentation, where no [n] means unlimited
Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 18:51:56 +02:00
Marius Storm-Olsen
8ddc280393 Clean up exit/die/return mess for exe*()
The exe*() functions were inconsistent of where they exited. So, make
sure that all exe*() confesses upon errors, and let the calling
functions use eval{} to avoid the exception when needed.

Change-Id: Ia6e4edb22a83ac32d924b792e8a2eea657a6a149
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 18:51:50 +02:00
Marius Storm-Olsen
9fa0f5ddf4 Fix copy'n'paste and code move bugs
Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
2012-04-20 18:51:45 +02:00
Marius Storm-Olsen
9be91b36b5 Add documentation for the build script
Change-Id: I59fdf997971b0fbb2e4b41a18735fe72215e21c1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
2012-04-20 18:51:40 +02:00
Marius Storm-Olsen
e400f9d6a6 Add --dry-run option to build script
The --dry-run option (-n for short) also allows levels of dry-run, where
the first level just shows what the build script itself will do. However
if you -n 2, then it will recurse the dry-run to the make as well, so
you can get a full dry-run of everything.

Change-Id: I3a3c8a844411219e7afe6a570bc9ef6718ba472f
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 18:51:36 +02:00
Marius Storm-Olsen
3dffd4e710 Just move functions closer to their logical place in the code
Makes it easier to read the code

Change-Id: I71ed3affa3d3fe4e2b782898c78f1c1a97371d26
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 18:51:30 +02:00
Oswald Buddenhagen
1e103533a0 override the remote refs only for /heads/
it's possible to add more refs, which makes git refuse to update the
configuration unless a value pattern to overwrite is specified.

Change-Id: I326c05a8ed200339bf8f3f45032409150570538c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 11:33:40 +02:00
Oswald Buddenhagen
c2543dc358 be explicit about qtbase/configure failing
so one has a base directory for paths it reports.

Task-number: QTBUG-25190
Change-Id: Ib222e2d7b07bf986a9eccd6934e51574b5a5a052
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 11:33:35 +02:00
Qt Submodule Update Bot
6562d7b44d Updated submodules.
Change-Id: Iee405a2fc2ec148a1807752270d692e30a6d01a5
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-04-17 10:05:34 +02:00
Qt Submodule Update Bot
ee405a2fc2 Updated submodules.
Change-Id: I2ff258da4c471556c58008035f13f0aadfae2635
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-17 01:16:54 +02:00
Qt Submodule Update Bot
2ff258da4c Updated submodules.
Change-Id: Id71eac3df29719dab31738d5ce6dd8a95cbe2642
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-16 01:06:21 +02:00
Qt Submodule Update Bot
d71eac3df2 Updated submodules.
Change-Id: I3ffb06482d9e956bbb211bf3d859f0c4fc4c0bbf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-14 01:13:08 +02:00
Qt Submodule Update Bot
3ffb06482d Updated submodules.
Change-Id: Ib56dc98feea2a1f3d08d3886bc37997aea5839b0
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-04-13 09:52:54 +02:00
Qt Submodule Update Bot
b56dc98fee Updated submodules.
Change-Id: I326ac549a1082e6aaf315fea0da08a7c40a225cd
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-13 00:47:06 +02:00
Marius Storm-Olsen
63124a31c7 Merge commit 'qt-v5.0.0-alpha1'
Change-Id: I182dae2e5c8622227751346b82822af0e90853c4
2012-04-11 13:24:27 -05:00
Oswald Buddenhagen
ba669e8f03 sort subdirs by dependencies
not just using $$sort_depends(), so that the independent modules are
still sorted more or less logically.

Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-11 10:42:06 +02:00
Marius Storm-Olsen
3b11129098 Qt 5.0.0 Alpha1 qt-v5.0.0-alpha1 2012-04-10 23:35:52 -05:00
Qt Submodule Update Bot
326ac549a1 Updated submodules.
Change-Id: I3d84b25eb5e300e427ef4c3e7329207f74dacd25
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-10 14:02:03 +02:00
Qt Submodule Update Bot
3d84b25eb5 Updated submodules.
Change-Id: I84dac570b9f422bd182b6389e58159a49349e260
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-10 03:38:16 +02:00
Qt Submodule Update Bot
84dac570b9 Updated submodules.
Change-Id: I51ca55ff29f53b909c3614b56609e067d2066124
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-07 00:45:35 +02:00
Qt Submodule Update Bot
51ca55ff29 Updated submodules.
Change-Id: If1a52c15fac028718d6f8ff6d2174a23cecb0e16
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-05 09:57:22 +02:00
Marius Storm-Olsen
1de59c1a07 Fix building on Windows and OSX
A problem with the dependency algorithm would make the top-most
dependent module not compile. Also affects building QtWayland on
Linux.

OSX has a problem when doing 'make install' on Qt configured with
prefix pointing to qtbase (no installation needed), so disable that
for the alpha, like on Windows.

Also, remove a redundant line in the script.

Change-Id: I368e80520977cf8a4bfcbbf13445f50c820aee9c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
6ab6bd8ff7 Avoid building webkit by default on Windows for now
WebKit still doesn't compile cleanly on Windows, so avoid it until
we have something which works.

Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
e4ed3288e9 Add build dependency for qtwayland + make qtwayland non default module
Running
    ./build qtwayland
will build qtwayland and its dependencies.

Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
72f4597c9d Avoid 'make install' on Windows
We normally don't 'make install' on Windows, so avoid it for the alpha.

Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Qt Submodule Update Bot
f1a52c15fa Updated submodules.
Change-Id: Ifeb89e2305c7c378fe2ccb12f60e199822376f90
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-05 00:20:06 +02:00
Friedemann Kleint
38adcf8077 build: Do not clobber existing values of CL environment variable.
Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-04-04 18:33:30 +02:00
Qt Submodule Update Bot
feb89e2305 Updated submodules.
Change-Id: I15f3399576bd433898f8e89bbcb3c1196e0da5b9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-31 14:33:43 +02:00
Simon Hausmann
8660603bb6 WebKit build fix (backport of http://trac.webkit.org/changeset/110426)
Change-Id: Id8c63524a068b8b604677c7115e7bdb2e6ab3b5c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-30 14:05:28 +02:00
Friedemann Kleint
8e5b652334 Fix build instructions (-j <n>).
Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
2012-03-30 14:54:59 +03:00
Marius Storm-Olsen
239b974f07 Fix building on Windows and OSX
A problem with the dependency algorithm would make the top-most
dependent module not compile. Also affects building QtWayland on
Linux.

OSX has a problem when doing 'make install' on Qt configured with
prefix pointing to qtbase (no installation needed), so disable that
for the alpha, like on Windows.

Also, remove a redundant line in the script.

Change-Id: I368e80520977cf8a4bfcbbf13445f50c820aee9c
2012-03-30 14:54:44 +03:00