summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2012-05-0414-0/+0
| | | | | Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-0325-0/+0
| | | | | Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unnecessary rules for .gitignoreYuchen Deng2012-04-241-258/+1
| | | | | | Change-Id: I07293521a4088593750f08a298160e9b476a9d73 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Support the --continue option, ignoring build failuresMarius Storm-Olsen2012-04-201-6/+25
| | | | | Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Follow -j [n] documentation, where no [n] means unlimitedMarius Storm-Olsen2012-04-201-6/+8
| | | | | Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Clean up exit/die/return mess for exe*()Marius Storm-Olsen2012-04-201-13/+16
| | | | | | | | | 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>
* Fix copy'n'paste and code move bugsMarius Storm-Olsen2012-04-201-2/+2
| | | | | | Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Add documentation for the build scriptMarius Storm-Olsen2012-04-201-0/+67
| | | | | | Change-Id: I59fdf997971b0fbb2e4b41a18735fe72215e21c1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Add --dry-run option to build scriptMarius Storm-Olsen2012-04-201-13/+24
| | | | | | | | | | | 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>
* Just move functions closer to their logical place in the codeMarius Storm-Olsen2012-04-201-56/+56
| | | | | | | | 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>
* override the remote refs only for /heads/Oswald Buddenhagen2012-04-201-1/+1
| | | | | | | | 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>
* be explicit about qtbase/configure failingOswald Buddenhagen2012-04-201-1/+4
| | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-04-173-0/+0
| | | | | Change-Id: Iee405a2fc2ec148a1807752270d692e30a6d01a5 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-04-1712-0/+0
| | | | | Change-Id: I2ff258da4c471556c58008035f13f0aadfae2635 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-04-164-0/+0
| | | | | Change-Id: Id71eac3df29719dab31738d5ce6dd8a95cbe2642 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-04-148-0/+0
| | | | | Change-Id: I3ffb06482d9e956bbb211bf3d859f0c4fc4c0bbf Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-04-133-0/+0
| | | | | Change-Id: Ib56dc98feea2a1f3d08d3886bc37997aea5839b0 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-04-1316-0/+0
| | | | | Change-Id: I326ac549a1082e6aaf315fea0da08a7c40a225cd Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Merge commit 'qt-v5.0.0-alpha1'Marius Storm-Olsen2012-04-110-0/+0
|\ | | | | | | Change-Id: I182dae2e5c8622227751346b82822af0e90853c4
| * Qt 5.0.0 Alpha1qt-v5.0.0-alpha1Marius Storm-Olsen2012-04-1018-33/+0
| |
| * Fix build instructions (-j <n>).Friedemann Kleint2012-03-301-1/+1
| | | | | | | | Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
| * Fix building on Windows and OSXMarius Storm-Olsen2012-03-301-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Avoid 'make install' on WindowsMarius Storm-Olsen2012-03-291-1/+4
| | | | | | | | | | | | We normally don't 'make install' on Windows, so avoid it for the alpha. Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add
| * Avoid building webkit by default on Windows for nowMarius Storm-Olsen2012-03-291-0/+1
| | | | | | | | | | | | | | WebKit still doesn't compile cleanly on Windows, so avoid it until we have something which works. Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9
| * Add build dependency for qtwayland + make qtwayland non default moduleMarius Storm-Olsen2012-03-292-3/+13
| | | | | | | | | | | | | | | | Running ./build qtwayland will build qtwayland and its dependencies. Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5Simo Fält2012-03-291-0/+0
| |\
| * | Fix readme to instruct building with the build script insteadMarius Storm-Olsen2012-03-281-3/+8
| | | | | | | | | | | | | | | | | | | | | Also, on Windows the build script adds the gnuwin32\bin directory, so we don't need that part in the readme Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32
| * | Clean up build scriptMarius Storm-Olsen2012-03-272-31/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | sort subdirs by dependenciesOswald Buddenhagen2012-04-111-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Updated submodules.Qt Submodule Update Bot2012-04-103-0/+0
| | | | | | | | | | | | | | | Change-Id: I3d84b25eb5e300e427ef4c3e7329207f74dacd25 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | Updated submodules.Qt Submodule Update Bot2012-04-103-0/+0
| | | | | | | | | | | | | | | Change-Id: I84dac570b9f422bd182b6389e58159a49349e260 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | Updated submodules.Qt Submodule Update Bot2012-04-077-0/+0
| | | | | | | | | | | | | | | Change-Id: I51ca55ff29f53b909c3614b56609e067d2066124 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | Updated submodules.Qt Submodule Update Bot2012-04-057-0/+0
| | | | | | | | | | | | | | | Change-Id: If1a52c15fac028718d6f8ff6d2174a23cecb0e16 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | Fix building on Windows and OSXMarius Storm-Olsen2012-04-051-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Avoid building webkit by default on Windows for nowMarius Storm-Olsen2012-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add build dependency for qtwayland + make qtwayland non default moduleMarius Storm-Olsen2012-04-052-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Running ./build qtwayland will build qtwayland and its dependencies. Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Avoid 'make install' on WindowsMarius Storm-Olsen2012-04-051-1/+4
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Updated submodules.Qt Submodule Update Bot2012-04-0516-0/+0
| | | | | | | | | | | | | | | Change-Id: Ifeb89e2305c7c378fe2ccb12f60e199822376f90 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | build: Do not clobber existing values of CL environment variable.Friedemann Kleint2012-04-041-2/+7
| | | | | | | | | | | | | | | Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Updated submodules.Qt Submodule Update Bot2012-03-3114-0/+0
| | | | | | | | | | | | | | | Change-Id: I15f3399576bd433898f8e89bbcb3c1196e0da5b9 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | | WebKit build fix (backport of http://trac.webkit.org/changeset/110426)Simon Hausmann2012-03-301-0/+0
| | | | | | | | | | | | | | | Change-Id: Id8c63524a068b8b604677c7115e7bdb2e6ab3b5c Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Fix build instructions (-j <n>).Friedemann Kleint2012-03-291-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Updated submodules.Qt Submodule Update Bot2012-03-2915-0/+0
| |/ |/| | | | | | | Change-Id: I712875dc293a4f71fd0a99646c8cd9c36b183ecf Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | WebKit Hotfix for Qt 5 alphaSimon Hausmann2012-03-291-0/+0
| | | | | | | | | | | | | | Eliminates pthread dependency on Windows. Change-Id: I39e7e6baf9e91f3f8223df7c78f5e904ece24f06 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Fix readme to instruct building with the build script insteadMarius Storm-Olsen2012-03-291-3/+8
| | | | | | | | | | | | | | | | 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>
* | Clean up build scriptMarius Storm-Olsen2012-03-292-31/+67
|/ | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-2712-0/+0
| | | | | Change-Id: I707e32535dacae1ec16226c0028c28efaf20b900 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Add build script for Qt 5Marius Storm-Olsen2012-03-262-0/+459
| | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-265-0/+0
| | | | | Change-Id: I1a121f1cb7f3188c94befbfae4418a6e5c9347e1 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-261-0/+0
| | | | | Change-Id: I8da3febd53b31c259ab1195ce842255f5ee2ab84 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>