Commit Graph

6 Commits

Author SHA1 Message Date
Lars Knoll
93310ed069 qtquick1 now depends on qttools, not the other way round
This depends on https://codereview.qt-project.org/#change,28044
and https://codereview.qt-project.org/#change,28047

Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-08 15:06:56 +02:00
Lars Knoll
008a5daf77 Cleanup build dependencies
Change-Id: Ibee6b46db3c10d80790af170470dd3439e1b6f88
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-07 01:10:12 +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
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
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