aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Updated submodules.Qt Submodule Update Bot2012-03-253-0/+0
| | | | | Change-Id: Ib7e524a79be2e5ba102b2009e5c453dcc8fdb2c9 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-2412-0/+0
| | | | | Change-Id: Id1a90d200b4a99e91e3fbdaf4e1cd8408a875364 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-2219-0/+0
| | | | | Change-Id: I10fe94d265413c52a958d4c5e4419d97b927df8e Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Add required dependencies for wayland moduleMarius Storm-Olsen2012-03-221-1/+1
| | | | | Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Only add dependency to qtactiveqt if it's availableMarius Storm-Olsen2012-03-211-2/+4
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-218-0/+0
| | | | | Change-Id: I7d0327830bb4768753cb0c14a23d98fed08be7d2 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-2111-0/+0
| | | | | Change-Id: I443a0d2e8e365e930feb5df460576c815e8e78ea Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix README for the Alpha release.Friedemann Kleint2012-03-201-15/+78
| | | | | | | Add more platform-specific information and commands. Change-Id: I54e5e8692b16330bf4d9316eaef0de5c895ec147 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-2010-0/+0
| | | | | Change-Id: I90ec097148dff321fa161ceec41c4d2cf3a7eee0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-1919-0/+0
| | | | | Change-Id: I41be8112dd411bb5734ba177c5391c75dd98b0d3 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-1510-0/+0
| | | | | Change-Id: I322ee6fd14717802a1f15c38e9c0ee04674879b2 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-145-0/+0
| | | | | Change-Id: I5a53de661c70041bca39a7c27666f299c04d7ccb Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* init-repository: mark as requiring perl 5.8Sergio Ahumada2012-03-141-1/+1
| | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-1310-0/+0
| | | | | Change-Id: Ib652510287f21697d673b007e7354e51248dbd7b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-136-0/+0
| | | | | Change-Id: I1d8dd4cffc93d619de473f3b9082923bfeaa5eab Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* QtSVG: Add dependency to declarative and quick1 if qtsvg is available.Toby Tomkins2012-03-131-1/+6
| | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-1213-0/+0
| | | | | Change-Id: Ibb28a5b1ba12a5d88da14245e15080e04942141d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Update WebKitSimon Hausmann2012-03-121-0/+0
| | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-125-0/+0
| | | | | Change-Id: I98a9eedf8fad52cc719e99041cec716171573145 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-123-0/+0
| | | | | Change-Id: I5ef268c784a65ed24332dfea1769e66b7b476a55 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-113-0/+0
| | | | | Change-Id: I944f23b42b16ec81dc01a8d5b6d958153c277edb Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Don't try to unlink non-existing alternates fileMarius Storm-Olsen2012-03-091-1/+3
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-03-0912-0/+0
| | | | | Change-Id: I0f86b327e4c71dcd811472a53c0b685eb6cbe0e1 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* WebKit2 is not yet supported on Windows, so avoid trying to build itMarius Storm-Olsen2012-03-091-0/+3
| | | | | Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Don't try to compile wayland on Windows or Mac, even if checked outMarius Storm-Olsen2012-03-081-1/+1
| | | | | Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-088-0/+0
| | | | | Change-Id: Ifae64ac90b68532d159e692fddd42afbc36132a2 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-0819-0/+0
| | | | | Change-Id: I5efc1e72fe916bbab53ed07c472dc82546856cde Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-054-0/+0
| | | | | Change-Id: I56f438fe18408c99f6a3e46b75e96b5004f1e087 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-042-0/+0
| | | | | Change-Id: I6868b56e525ca71c281011c1faf0cd7dc4393c91 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-0319-0/+0
| | | | | Change-Id: Ibc8806c07b28499d11677fa36710a3eee5791763 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Added new module, qtgraphicaleffects.Sergio Ahumada2012-03-034-0/+11
| | | | | | | Not yet enabled by default. Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-03-0110-0/+0
| | | | | Change-Id: I92c6ddea46d94f3f7106da6fa436fb41f7cb4197 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* QtLocation: Add hard dependency on qtjsondb to qtlocation.Toby Tomkins2012-03-011-1/+1
| | | | | | | | | | Currently there is a soft dependency on qtjsondb. This change makes it a hard dependency. Change-Id: Iba29c91093c3c6c67c4121f6f220e62686708040 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-02-298-0/+0
| | | | | Change-Id: Iace98c78bd5080dc4108c908063e6b890aeebb38 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-02-2913-0/+0
| | | | | Change-Id: I110218ff59ff5e0099865dc1f33a0cc7e78fdbf1 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-02-284-0/+0
| | | | | Change-Id: I799b0f5184f42d18c8b683c5bd355e52ff1a4b9c Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-02-282-0/+0
| | | | | Change-Id: I5fd4066161c909463c14a2f59ba2d726c1a1d78a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-02-2712-0/+0
| | | | | Change-Id: I08116e00e55d3d65864f4bc00a60defec1543cb6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:11:39 +0000