Commit Graph

425 Commits

Author SHA1 Message Date
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
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
74f7b7f74c Fix build instructions (-j <n>).
Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-29 16:23:47 +02:00
Qt Submodule Update Bot
15f3399576 Updated submodules.
Change-Id: I712875dc293a4f71fd0a99646c8cd9c36b183ecf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-29 10:13:09 +02:00
Simon Hausmann
bec6a6c5bc WebKit Hotfix for Qt 5 alpha
Eliminates pthread dependency on Windows.

Change-Id: I39e7e6baf9e91f3f8223df7c78f5e904ece24f06
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-29 04:05:43 +02:00
Marius Storm-Olsen
598f4975d3 Fix readme to instruct building with the build script instead
Also, on Windows the build script adds the gnuwin32\bin directory, so
we don't need that part in the readme

Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-29 04:05:41 +02:00
Marius Storm-Olsen
2e119465a5 Clean up build script
Remove loading of thread modules. Not core module, and we don't use
them.

Return value of system command.

Add --force-qmake option, and by default avoid running qmake when a
Makefile already exists.

Do not pass '-j 1' unless explicit on the command line, and pick up
'MAKE' environment variable. (Thiago)

Remove usage of File::Which, as it's not a core module, and often not
present on host machines. (Peppe)

Remove '-s' or '/s' optin to make/nmake, as we cannot see how far we
have compiled, and we only get warnings/errors.

Change the qtwebkit build command, and add separate command for
installing qtwebkit. Also add the required build tools for WebKit
on Windows.

Change-Id: I79bffa39a13ece78fa401f39a38a1ccaf0f389b0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-03-29 04:05:39 +02:00
Qt Submodule Update Bot
712875dc29 Updated submodules.
Change-Id: I707e32535dacae1ec16226c0028c28efaf20b900
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-27 09:06:34 +02:00
Marius Storm-Olsen
b60fa530d9 Add build script for Qt 5
The build script will build each module individually, and install them
if needed, in the correct order.

Change-Id: I9416e624b080b8b25241270e909bd120a4028137
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-26 21:24:44 +02:00
Qt Submodule Update Bot
707e32535d Updated submodules.
Change-Id: I1a121f1cb7f3188c94befbfae4418a6e5c9347e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-03-26 09:15:19 +02:00
Qt Submodule Update Bot
1a121f1cb7 Updated submodules.
Change-Id: I8da3febd53b31c259ab1195ce842255f5ee2ab84
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-26 00:47:17 +02:00
Qt Submodule Update Bot
8da3febd53 Updated submodules.
Change-Id: Ib7e524a79be2e5ba102b2009e5c453dcc8fdb2c9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-25 12:42:05 +02:00
Qt Submodule Update Bot
b7e524a79b Updated submodules.
Change-Id: Id1a90d200b4a99e91e3fbdaf4e1cd8408a875364
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-24 00:52:14 +01:00
Qt Submodule Update Bot
d1a90d200b Updated submodules.
Change-Id: I10fe94d265413c52a958d4c5e4419d97b927df8e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-22 23:37:56 +01:00
Marius Storm-Olsen
8320adcfa0 Add required dependencies for wayland module
Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-03-22 06:29:04 +01:00
Marius Storm-Olsen
c04675aab8 Only add dependency to qtactiveqt if it's available
Don't need to be platform specific about it.

Change-Id: I3ca981ec03b977961afaa18f09cde10b8b99c64e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-21 14:39:14 +01:00
Qt Submodule Update Bot
10fe94d265 Updated submodules.
Change-Id: I7d0327830bb4768753cb0c14a23d98fed08be7d2
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-03-21 10:37:10 +01:00
Qt Submodule Update Bot
7d0327830b Updated submodules.
Change-Id: I443a0d2e8e365e930feb5df460576c815e8e78ea
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-21 05:26:11 +01:00
Friedemann Kleint
ad32d4f847 Fix README for the Alpha release.
Add more platform-specific information and commands.

Change-Id: I54e5e8692b16330bf4d9316eaef0de5c895ec147
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-20 14:42:50 +01:00
Qt Submodule Update Bot
443a0d2e8e Updated submodules.
Change-Id: I90ec097148dff321fa161ceec41c4d2cf3a7eee0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-20 08:40:01 +01:00
Qt Submodule Update Bot
90ec097148 Updated submodules.
Change-Id: I41be8112dd411bb5734ba177c5391c75dd98b0d3
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-03-19 16:59:08 +01:00
Qt Submodule Update Bot
41be8112dd Updated submodules.
Change-Id: I322ee6fd14717802a1f15c38e9c0ee04674879b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-15 08:07:12 +01:00
Qt Submodule Update Bot
322ee6fd14 Updated submodules.
Change-Id: I5a53de661c70041bca39a7c27666f299c04d7ccb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-14 06:10:28 +01:00
Sergio Ahumada
ae4d6b9313 init-repository: mark as requiring perl 5.8
This script also works with perl 5.8, so changing the minumum requirement
from v5.10 to v5.8.

Change-Id: Ia5e59f929bca3e795da015830aeae7ef0d7067e0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-03-14 02:40:10 +01:00
Qt Submodule Update Bot
5a53de661c Updated submodules.
Change-Id: Ib652510287f21697d673b007e7354e51248dbd7b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-03-13 23:19:34 +01:00
Qt Submodule Update Bot
b652510287 Updated submodules.
Change-Id: I1d8dd4cffc93d619de473f3b9082923bfeaa5eab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-13 09:05:41 +01:00
Toby Tomkins
e3c8992fae QtSVG: Add dependency to declarative and quick1 if qtsvg is available.
Currently there is a soft dependency on qtsvg that causes a build of
qt5 to have unknown build order for qtsvg and other modules. This
change makes it a hard dependency if the qtsvg module is available.

Change-Id: Ic58a63f3f5f1d813ba832455c1ad3af41599926b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-03-13 02:47:16 +01:00
Qt Submodule Update Bot
1d8dd4cffc Updated submodules.
Change-Id: Ibb28a5b1ba12a5d88da14245e15080e04942141d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-12 23:47:38 +01:00
Simon Hausmann
5df54ad846 Update WebKit
Includes build fixes for latest API changes in qtbase/qtdeclarative as
well as the final QML2 API.

Change-Id: Ia3023c1dcd45b6acdcf71e4659fe81231740c344
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-03-12 14:16:44 +01:00
Qt Submodule Update Bot
bb28a5b1ba Updated submodules.
Change-Id: I98a9eedf8fad52cc719e99041cec716171573145
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-12 08:24:21 +01:00
Qt Submodule Update Bot
98a9eedf8f Updated submodules.
Change-Id: I5ef268c784a65ed24332dfea1769e66b7b476a55
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-12 01:06:50 +01:00
Qt Submodule Update Bot
5ef268c784 Updated submodules.
Change-Id: I944f23b42b16ec81dc01a8d5b6d958153c277edb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-11 00:35:05 +01:00
Marius Storm-Olsen
aa431f407f Don't try to unlink non-existing alternates file
If you clone using alternates, but the checkout you are using as
alternates does not have a submodule, there will be no alternates
file for this submodule.

Change-Id: Ibd9ed5454459587b6df9d420af4d66d61f4317ca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-09 21:14:07 +01:00
Qt Submodule Update Bot
944f23b42b Updated submodules.
Change-Id: I0f86b327e4c71dcd811472a53c0b685eb6cbe0e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-03-09 18:36:14 +01:00
Marius Storm-Olsen
8703d56ab2 WebKit2 is not yet supported on Windows, so avoid trying to build it
Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-03-09 12:31:24 +01:00
Marius Storm-Olsen
610bb3545d Don't try to compile wayland on Windows or Mac, even if checked out
Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-03-08 22:18:14 +01:00
Qt Submodule Update Bot
0f86b327e4 Updated submodules.
Change-Id: Ifae64ac90b68532d159e692fddd42afbc36132a2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-08 08:34:07 +01:00
Qt Submodule Update Bot
fae64ac90b Updated submodules.
Change-Id: I5efc1e72fe916bbab53ed07c472dc82546856cde
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-03-08 03:36:55 +01:00
Qt Submodule Update Bot
5efc1e72fe Updated submodules.
Change-Id: I56f438fe18408c99f6a3e46b75e96b5004f1e087
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-05 02:43:01 +01:00