mirror/qt/qt5.git
8 years agoAvoid building webkit by default on Windows for now
Marius Storm-Olsen [Thu, 29 Mar 2012 10:59:44 +0000 (05:59 -0500)]
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>
8 years agoAdd build dependency for qtwayland + make qtwayland non default module
Marius Storm-Olsen [Wed, 28 Mar 2012 21:28:25 +0000 (16:28 -0500)]
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>
8 years agoAvoid 'make install' on Windows
Marius Storm-Olsen [Wed, 28 Mar 2012 18:07:22 +0000 (13:07 -0500)]
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>
8 years agoUpdated submodules. master_201204050927
Qt Submodule Update Bot [Wed, 4 Apr 2012 22:01:19 +0000 (08:01 +1000)]
Updated submodules.

Change-Id: Ifeb89e2305c7c378fe2ccb12f60e199822376f90
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agobuild: Do not clobber existing values of CL environment variable. master_201204050248
Friedemann Kleint [Wed, 4 Apr 2012 15:09:53 +0000 (17:09 +0200)]
build: Do not clobber existing values of CL environment variable.

Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
8 years agoUpdated submodules. master_201203312248
Qt Submodule Update Bot [Sat, 31 Mar 2012 07:06:11 +0000 (17:06 +1000)]
Updated submodules.

Change-Id: I15f3399576bd433898f8e89bbcb3c1196e0da5b9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoWebKit build fix (backport of http://trac.webkit.org/changeset/110426) master_201203302231
Simon Hausmann [Fri, 30 Mar 2012 11:49:11 +0000 (13:49 +0200)]
WebKit build fix (backport of trac.webkit.org/changeset/110426)

Change-Id: Id8c63524a068b8b604677c7115e7bdb2e6ab3b5c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
8 years agoFix build instructions (-j <n>). master_201203300335
Friedemann Kleint [Thu, 29 Mar 2012 14:17:33 +0000 (16:17 +0200)]
Fix build instructions (-j <n>).

Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
8 years agoUpdated submodules. master_201203291828
Qt Submodule Update Bot [Thu, 29 Mar 2012 07:10:28 +0000 (17:10 +1000)]
Updated submodules.

Change-Id: I712875dc293a4f71fd0a99646c8cd9c36b183ecf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoWebKit Hotfix for Qt 5 alpha master_201203291220
Simon Hausmann [Tue, 27 Mar 2012 13:56:58 +0000 (15:56 +0200)]
WebKit Hotfix for Qt 5 alpha

Eliminates pthread dependency on Windows.

Change-Id: I39e7e6baf9e91f3f8223df7c78f5e904ece24f06
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
8 years agoFix readme to instruct building with the build script instead
Marius Storm-Olsen [Wed, 28 Mar 2012 10:48:40 +0000 (05:48 -0500)]
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>
8 years agoClean up build script
Marius Storm-Olsen [Tue, 27 Mar 2012 14:50:27 +0000 (09:50 -0500)]
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>
8 years agoUpdated submodules. master_201203271720
Qt Submodule Update Bot [Tue, 27 Mar 2012 06:59:47 +0000 (16:59 +1000)]
Updated submodules.

Change-Id: I707e32535dacae1ec16226c0028c28efaf20b900
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoAdd build script for Qt 5 master_201203270538
Marius Storm-Olsen [Tue, 20 Mar 2012 08:00:28 +0000 (09:00 +0100)]
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>
8 years agoUpdated submodules. master_201203261729
Qt Submodule Update Bot [Mon, 26 Mar 2012 07:06:20 +0000 (17:06 +1000)]
Updated submodules.

Change-Id: I1a121f1cb7f3188c94befbfae4418a6e5c9347e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201203260901
Qt Submodule Update Bot [Sun, 25 Mar 2012 22:06:37 +0000 (08:06 +1000)]
Updated submodules.

Change-Id: I8da3febd53b31c259ab1195ce842255f5ee2ab84
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203252056
Qt Submodule Update Bot [Sun, 25 Mar 2012 07:05:36 +0000 (17:05 +1000)]
Updated submodules.

Change-Id: Ib7e524a79be2e5ba102b2009e5c453dcc8fdb2c9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203241006
Qt Submodule Update Bot [Fri, 23 Mar 2012 21:59:00 +0000 (07:59 +1000)]
Updated submodules.

Change-Id: Id1a90d200b4a99e91e3fbdaf4e1cd8408a875364
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203230852
Qt Submodule Update Bot [Thu, 22 Mar 2012 21:58:45 +0000 (07:58 +1000)]
Updated submodules.

Change-Id: I10fe94d265413c52a958d4c5e4419d97b927df8e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoAdd required dependencies for wayland module master_201203221543
Marius Storm-Olsen [Wed, 21 Mar 2012 23:29:28 +0000 (00:29 +0100)]
Add required dependencies for wayland module

Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
8 years agoOnly add dependency to qtactiveqt if it's available master_201203212353
Marius Storm-Olsen [Wed, 21 Mar 2012 11:13:19 +0000 (12:13 +0100)]
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>
8 years agoUpdated submodules. master_201203211951
Qt Submodule Update Bot [Wed, 21 Mar 2012 09:12:47 +0000 (19:12 +1000)]
Updated submodules.

Change-Id: I7d0327830bb4768753cb0c14a23d98fed08be7d2
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201203211439
Qt Submodule Update Bot [Wed, 21 Mar 2012 04:20:34 +0000 (14:20 +1000)]
Updated submodules.

Change-Id: I443a0d2e8e365e930feb5df460576c815e8e78ea
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoFix README for the Alpha release. master_201203202356
Friedemann Kleint [Thu, 15 Mar 2012 09:23:04 +0000 (10:23 +0100)]
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>
8 years agoUpdated submodules. master_201203202036
Qt Submodule Update Bot [Tue, 20 Mar 2012 07:05:06 +0000 (17:05 +1000)]
Updated submodules.

Change-Id: I90ec097148dff321fa161ceec41c4d2cf3a7eee0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203200212
Qt Submodule Update Bot [Mon, 19 Mar 2012 15:54:11 +0000 (01:54 +1000)]
Updated submodules.

Change-Id: I41be8112dd411bb5734ba177c5391c75dd98b0d3
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201203151957
Qt Submodule Update Bot [Thu, 15 Mar 2012 07:05:58 +0000 (17:05 +1000)]
Updated submodules.

Change-Id: I322ee6fd14717802a1f15c38e9c0ee04674879b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203141523
Qt Submodule Update Bot [Wed, 14 Mar 2012 03:26:28 +0000 (13:26 +1000)]
Updated submodules.

Change-Id: I5a53de661c70041bca39a7c27666f299c04d7ccb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoinit-repository: mark as requiring perl 5.8 master_201203141153
Sergio Ahumada [Tue, 13 Mar 2012 14:11:04 +0000 (15:11 +0100)]
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>
8 years agoUpdated submodules. master_201203140833
Qt Submodule Update Bot [Tue, 13 Mar 2012 22:06:25 +0000 (08:06 +1000)]
Updated submodules.

Change-Id: Ib652510287f21697d673b007e7354e51248dbd7b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201203131819
Qt Submodule Update Bot [Tue, 13 Mar 2012 07:58:16 +0000 (17:58 +1000)]
Updated submodules.

Change-Id: I1d8dd4cffc93d619de473f3b9082923bfeaa5eab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoQtSVG: Add dependency to declarative and quick1 if qtsvg is available. master_201203131200
Toby Tomkins [Thu, 8 Mar 2012 02:52:40 +0000 (12:52 +1000)]
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>
8 years agoUpdated submodules. master_201203130900
Qt Submodule Update Bot [Mon, 12 Mar 2012 22:45:06 +0000 (08:45 +1000)]
Updated submodules.

Change-Id: Ibb28a5b1ba12a5d88da14245e15080e04942141d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdate WebKit master_201203122330
Simon Hausmann [Mon, 12 Mar 2012 13:14:06 +0000 (14:14 +0100)]
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>
8 years agoUpdated submodules. master_201203121737
Qt Submodule Update Bot [Mon, 12 Mar 2012 07:05:32 +0000 (17:05 +1000)]
Updated submodules.

Change-Id: I98a9eedf8fad52cc719e99041cec716171573145
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203121020
Qt Submodule Update Bot [Sun, 11 Mar 2012 21:58:41 +0000 (07:58 +1000)]
Updated submodules.

Change-Id: I5ef268c784a65ed24332dfea1769e66b7b476a55
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203110948
Qt Submodule Update Bot [Sat, 10 Mar 2012 22:04:07 +0000 (08:04 +1000)]
Updated submodules.

Change-Id: I944f23b42b16ec81dc01a8d5b6d958153c277edb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoDon't try to unlink non-existing alternates file master_201203100627
Marius Storm-Olsen [Thu, 8 Mar 2012 20:28:52 +0000 (14:28 -0600)]
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>
8 years agoUpdated submodules. master_201203100349
Qt Submodule Update Bot [Fri, 9 Mar 2012 17:18:24 +0000 (03:18 +1000)]
Updated submodules.

Change-Id: I0f86b327e4c71dcd811472a53c0b685eb6cbe0e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoWebKit2 is not yet supported on Windows, so avoid trying to build it master_201203100037
Marius Storm-Olsen [Thu, 8 Mar 2012 20:34:10 +0000 (14:34 -0600)]
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>
8 years agoDon't try to compile wayland on Windows or Mac, even if checked out master_201203090731
Marius Storm-Olsen [Thu, 8 Mar 2012 20:33:21 +0000 (14:33 -0600)]
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>
8 years agoUpdated submodules. master_201203081747
Qt Submodule Update Bot [Thu, 8 Mar 2012 07:16:29 +0000 (17:16 +1000)]
Updated submodules.

Change-Id: Ifae64ac90b68532d159e692fddd42afbc36132a2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203081250
Qt Submodule Update Bot [Thu, 8 Mar 2012 02:36:08 +0000 (12:36 +1000)]
Updated submodules.

Change-Id: I5efc1e72fe916bbab53ed07c472dc82546856cde
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201203051201
Qt Submodule Update Bot [Sun, 4 Mar 2012 21:57:43 +0000 (07:57 +1000)]
Updated submodules.

Change-Id: I56f438fe18408c99f6a3e46b75e96b5004f1e087
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203041820
Qt Submodule Update Bot [Sat, 3 Mar 2012 22:03:16 +0000 (08:03 +1000)]
Updated submodules.

Change-Id: I6868b56e525ca71c281011c1faf0cd7dc4393c91
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201203031836
Qt Submodule Update Bot [Sat, 3 Mar 2012 07:05:18 +0000 (17:05 +1000)]
Updated submodules.

Change-Id: Ibc8806c07b28499d11677fa36710a3eee5791763
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
8 years agoAdded new module, qtgraphicaleffects. master_201203031005
Sergio Ahumada [Fri, 2 Mar 2012 11:53:33 +0000 (12:53 +0100)]
Added new module, qtgraphicaleffects.

Not yet enabled by default.

Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201203011857
Qt Submodule Update Bot [Thu, 1 Mar 2012 07:07:12 +0000 (17:07 +1000)]
Updated submodules.

Change-Id: I92c6ddea46d94f3f7106da6fa436fb41f7cb4197
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoQtLocation: Add hard dependency on qtjsondb to qtlocation. master_201203011500
Toby Tomkins [Wed, 29 Feb 2012 07:35:24 +0000 (17:35 +1000)]
QtLocation: Add hard dependency on qtjsondb to qtlocation.

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>
8 years agoUpdated submodules. master_201202291833
Qt Submodule Update Bot [Wed, 29 Feb 2012 07:04:59 +0000 (17:04 +1000)]
Updated submodules.

Change-Id: Iace98c78bd5080dc4108c908063e6b890aeebb38
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201202291011
Qt Submodule Update Bot [Tue, 28 Feb 2012 21:57:04 +0000 (07:57 +1000)]
Updated submodules.

Change-Id: I110218ff59ff5e0099865dc1f33a0cc7e78fdbf1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202281802
Qt Submodule Update Bot [Tue, 28 Feb 2012 07:06:15 +0000 (17:06 +1000)]
Updated submodules.

Change-Id: I799b0f5184f42d18c8b683c5bd355e52ff1a4b9c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202281301
Qt Submodule Update Bot [Tue, 28 Feb 2012 02:25:22 +0000 (12:25 +1000)]
Updated submodules.

Change-Id: I5fd4066161c909463c14a2f59ba2d726c1a1d78a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202280841
Qt Submodule Update Bot [Mon, 27 Feb 2012 22:06:04 +0000 (08:06 +1000)]
Updated submodules.

Change-Id: I08116e00e55d3d65864f4bc00a60defec1543cb6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201202271721
Qt Submodule Update Bot [Mon, 27 Feb 2012 07:08:21 +0000 (17:08 +1000)]
Updated submodules.

Change-Id: I04da6363036806d35f4b049c6931f7d8634cb61d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202270926
Qt Submodule Update Bot [Sun, 26 Feb 2012 21:55:29 +0000 (07:55 +1000)]
Updated submodules.

Change-Id: I08c07fbadb501b0d93452d81a47c0a0b4af64fa2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202261004
Qt Submodule Update Bot [Sat, 25 Feb 2012 22:03:31 +0000 (08:03 +1000)]
Updated submodules.

Change-Id: I2c614ce9b8bd078660e5b6955a2af1faa79a043c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202251857
Qt Submodule Update Bot [Sat, 25 Feb 2012 06:56:38 +0000 (16:56 +1000)]
Updated submodules.

Change-Id: Ie5acb7022476ecaef8f7899632092de739df897b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202251033
Qt Submodule Update Bot [Fri, 24 Feb 2012 21:57:20 +0000 (07:57 +1000)]
Updated submodules.

Change-Id: I7f8c9b7eaf9efcda699d4f170cb72f5c2cb71a1d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdate WebKit master_201202250152
Simon Hausmann [Fri, 24 Feb 2012 15:38:33 +0000 (16:38 +0100)]
Update WebKit

This brings WebKit in sync with the latest Qt 5 API and behavioural changes.

Change-Id: Ia0b2b3ad8f4db82ad39675912f6a168ad3ed6ae6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
8 years agoUpdated submodules. master_201202241318
Qt Submodule Update Bot [Fri, 24 Feb 2012 02:58:18 +0000 (12:58 +1000)]
Updated submodules.

Change-Id: I59eebee2600505b2d207d651fb5aa0da979f0f6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202212148
Qt Submodule Update Bot [Tue, 21 Feb 2012 11:31:01 +0000 (21:31 +1000)]
Updated submodules.

Change-Id: I1baa51c3d06dfaf08afe16e3e7dd77a63052a419
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202151901
Qt Submodule Update Bot [Wed, 15 Feb 2012 07:07:27 +0000 (17:07 +1000)]
Updated submodules.

Change-Id: I2e44cb1b7b83de14f5502bedf1669110b6d78a6d
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoFixed incorrect dependencies for qttools master_201202151618
Rohan McGovern [Wed, 15 Feb 2012 04:16:08 +0000 (14:16 +1000)]
Fixed incorrect dependencies for qttools

qttools uses both qtquick1 and qtdeclarative.

Change-Id: I3ec8ef3d770b029bec865a67aaaad3eb9db464d5
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202151331
Qt Submodule Update Bot [Wed, 15 Feb 2012 03:18:43 +0000 (13:18 +1000)]
Updated submodules.

Change-Id: Ic4ebe393de42d16314b27ae024087fa942436474
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoAdd license header to configure script. master_201202141514
Jason McDonald [Tue, 14 Feb 2012 05:01:17 +0000 (15:01 +1000)]
Add license header to configure script.

Change-Id: I231ee1c8ad214c3b09de35578009da4b47bcd00b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated qtbase. master_201202101723
Rohan McGovern [Fri, 10 Feb 2012 07:05:35 +0000 (17:05 +1000)]
Updated qtbase.

Includes one important autotest fix (tst_qicon).

Change-Id: Ia93fe84a050f7bb1cea6155ee10c101c6c36252b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201202101209
Rohan McGovern [Fri, 10 Feb 2012 01:50:35 +0000 (11:50 +1000)]
Updated submodules.

This commit is equivalent to one of the normal automated updates except
qtjsondb was deliberately held back a few commits, as it has some
source-incompatible changes which require updates in most modules.

Change-Id: I339ae36d10a747d0aa705d8839f68e4ca6758c5b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdate WebKit master_201202092354
Simon Hausmann [Thu, 9 Feb 2012 13:40:47 +0000 (14:40 +0100)]
Update WebKit

Fixes build issues with latest qtbase.

Change-Id: If45968d6b75a0d46f55b0064764c95f726172232
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
8 years agoAdd the QtQuick1 module. master_201202091705
Andrew den Exter [Wed, 8 Feb 2012 07:45:40 +0000 (17:45 +1000)]
Add the QtQuick1 module.

Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201202081751
Qt Submodule Update Bot [Wed, 8 Feb 2012 06:58:04 +0000 (16:58 +1000)]
Updated submodules.

Change-Id: I48a84504374730c6eb14c265f2fe96a4cfe02294
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated WebKit to new snapshot. master_201202040239
Simon Hausmann [Fri, 3 Feb 2012 08:57:27 +0000 (09:57 +0100)]
Updated WebKit to new snapshot.

Change-Id: I30da2162f0e5de95c49bb8d4004b0dfd0824712c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
8 years agoUpdated submodules. master_201202021741
Qt Submodule Update Bot [Thu, 2 Feb 2012 06:59:22 +0000 (16:59 +1000)]
Updated submodules.

Change-Id: Iebf10988f49c31f3bcf595a1e043cdac47c3e138
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201202021009
Qt Submodule Update Bot [Wed, 1 Feb 2012 22:03:12 +0000 (08:03 +1000)]
Updated submodules.

Change-Id: Icab9e353192b34a411122e718c8810e7cc342d29
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201202012251
Qt Submodule Update Bot [Wed, 1 Feb 2012 12:20:04 +0000 (22:20 +1000)]
Updated submodules.

Change-Id: Ia065c70489e96aa254089a666c0a6fcc89c50825
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201201312026
Qt Submodule Update Bot [Tue, 31 Jan 2012 07:07:08 +0000 (17:07 +1000)]
Updated submodules.

Change-Id: Ie42f2ef362f4a4c3caef754bfab578f78c5ee01c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

8 years agoAdd qtimageformats module to Qt5. master_201201311526
Toby Tomkins [Tue, 31 Jan 2012 00:19:39 +0000 (10:19 +1000)]
Add qtimageformats module to Qt5.

Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoRemove "All rights reserved" line from license headers. master_201201301851
Jason McDonald [Tue, 24 Jan 2012 06:08:31 +0000 (16:08 +1000)]
Remove "All rights reserved" line from license headers.

As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I5a62f56e4a36874b51c3258d02ae563e5810a422
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdate contact address in license headers. master_201201301318
Jason McDonald [Tue, 24 Jan 2012 06:07:20 +0000 (16:07 +1000)]
Update contact address in license headers.

Change-Id: I2b7793cf4fbb605f58257e71614dcd6e2855a82d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201291406
Qt Submodule Update Bot [Sat, 28 Jan 2012 21:55:04 +0000 (07:55 +1000)]
Updated submodules.

Change-Id: I9e62f9e496f92a75d162cbebbc7c00d3b37e6231
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201201271858
Qt Submodule Update Bot [Fri, 27 Jan 2012 07:02:51 +0000 (17:02 +1000)]
Updated submodules.

Change-Id: Icb9558f041132ea2c6c0acb360214c5bab4376bf
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201201251713
Qt Submodule Update Bot [Wed, 25 Jan 2012 07:02:21 +0000 (17:02 +1000)]
Updated submodules.

Change-Id: I823340af637a2302c17e64f54f4aa3f076b3d9f4
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoRemove QtQuick3D repository references from Qt5. master_201201251207
Toby Tomkins [Thu, 19 Jan 2012 07:50:02 +0000 (17:50 +1000)]
Remove QtQuick3D repository references from Qt5.

Qt3D had temporarily resided in the Qt5 repository under qtquick3d.
There is now a qt3d submodule which is compiling and testing correctly.
Qt5 had previously removed support for building the qtquick3d submodule
by default. This commit is the final step in cleaning up the previous
version.

Task-number: QTBUG-22098

Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
8 years agoUpdated submodules. master_201201241437
Qt Submodule Update Bot [Tue, 24 Jan 2012 04:13:05 +0000 (14:13 +1000)]
Updated submodules.

Change-Id: Ia7aadc710102a499d87848fd9c90dfc57c7433e7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201231750
Qt Submodule Update Bot [Mon, 23 Jan 2012 07:03:01 +0000 (17:03 +1000)]
Updated submodules.

Change-Id: Ib59d3abcfa9005ea938d5c233d02cd9dd656f63f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201201231247
Qt Submodule Update Bot [Mon, 23 Jan 2012 02:10:07 +0000 (12:10 +1000)]
Updated submodules.

Change-Id: I351cdb1d58e2ffca9c3ebd9987f5743a06fb148c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoQt5: Enable compilation of qtjsondb by default. master_201201201034
Jyri Tahtela [Tue, 10 Jan 2012 06:54:49 +0000 (16:54 +1000)]
Qt5: Enable compilation of qtjsondb by default.

Dependency to other modules (qtpim, qtdocgallery, qtsystems)
is defined if qtjsondb is checked out.

Change-Id: I0e0abc8d30733b9d7c1fdc666cd064fe6809442a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201191729
Qt Submodule Update Bot [Thu, 19 Jan 2012 07:07:12 +0000 (17:07 +1000)]
Updated submodules.

Change-Id: I13804ab06991c5e841d6869589ed53223066b824
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201190815
Qt Submodule Update Bot [Wed, 18 Jan 2012 22:02:35 +0000 (08:02 +1000)]
Updated submodules.

Change-Id: I8982f81129b893a4279c1390b90e834938e9e7f9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201181530
Qt Submodule Update Bot [Wed, 18 Jan 2012 05:15:50 +0000 (15:15 +1000)]
Updated submodules.

Change-Id: I6f4f0fed90c30f09d6116ffda668aa1b0e45d3ec
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoSwitch default builds from qtquick3d repo to qt3d repo
Rohan McGovern [Tue, 17 Jan 2012 04:01:11 +0000 (14:01 +1000)]
Switch default builds from qtquick3d repo to qt3d repo

Disable qtquick3d by default and enable qt3d by default.
Make qtlocation depend on qt3d instead of qtquick3d.

qtquick3d still exists for now, and can be explicitly compiled if
necessary.

Change-Id: If1013a9361b17421217beffd2dc1864c5e8502f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
8 years agodon't treat qt3d specially any more master_201201171146
Oswald Buddenhagen [Wed, 4 Jan 2012 19:41:20 +0000 (20:41 +0100)]
don't treat qt3d specially any more

it moved to gerrit properly

Task-number: QTBUG-23441
Change-Id: If15a8a9158637d82ca5b3f567d79b7376b43503c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201170957
Qt Submodule Update Bot [Mon, 16 Jan 2012 21:56:13 +0000 (07:56 +1000)]
Updated submodules.

Change-Id: I38fcd2c1057efd666478f1975f7edcc203be4ab7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201201161711
Qt Submodule Update Bot [Mon, 16 Jan 2012 07:02:06 +0000 (17:02 +1000)]
Updated submodules.

Change-Id: I013333216a7d3716a5825dbaf463f6e29a57ffb9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoinit-repository: fixed warnings when no mirror is used master_201201161135
Rohan McGovern [Mon, 16 Jan 2012 01:01:58 +0000 (11:01 +1000)]
init-repository: fixed warnings when no mirror is used

Don't test for the existence of the mirror if the user didn't ask to
use a mirror.

Change-Id: Ib5565fa9a68ba6e22a4f7a179a0f00eb998da2aa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
8 years agoUpdated submodules. master_201201131042
Qt Submodule Update Bot [Thu, 12 Jan 2012 22:03:23 +0000 (08:03 +1000)]
Updated submodules.

Change-Id: Ideeed25932e27ad838641780b9374f2fece2428a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoRemove special casing of qtjsbackend for cloning master_201201121718
Simon Hausmann [Thu, 12 Jan 2012 06:40:38 +0000 (07:40 +0100)]
Remove special casing of qtjsbackend for cloning

Mirroring is set up for the repository now.

Change-Id: Iee21600f2222103e5777fa95e58a6c2ddaeea58f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 12 Jan 2012 06:57:08 +0000 (16:57 +1000)]
Updated submodules.

Change-Id: I754fb71efdbf5350b32a5cd9126af73a604f6032
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201201121246
Qt Submodule Update Bot [Wed, 11 Jan 2012 21:57:02 +0000 (07:57 +1000)]
Updated submodules.

Change-Id: Ibaabf8a5e27479e91dbdccff4e535cdc94572baf
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoRemove obsolete submodule handling. master_201201120915
Simon Hausmann [Thu, 5 Jan 2012 10:45:50 +0000 (11:45 +0100)]
Remove obsolete submodule handling.

We do not use submodules for our copy of v8 anymore.

Change-Id: I9da0f79d23336ee7efc074d4481d6bcdb0550bfc
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>