Commit Graph

6 Commits

Author SHA1 Message Date
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
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
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
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