mirror/qt/qt5.git
6 years agodon't unnecessarily confuse qt creator stable_1390457979
Oswald Buddenhagen [Tue, 12 Nov 2013 15:35:05 +0000 (16:35 +0100)]
don't unnecessarily confuse qt creator

our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.

Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
6 years agoUpdated submodules. stable_1390240332
Qt Submodule Update Bot [Mon, 20 Jan 2014 17:34:32 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
6 years agoUpdated submodules. stable_1390219581
Qt Submodule Update Bot [Mon, 20 Jan 2014 09:34:08 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1389948410
Qt Submodule Update Bot [Fri, 17 Jan 2014 01:34:49 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1389340221
Qt Submodule Update Bot [Fri, 10 Jan 2014 01:34:23 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
6 years agoUpdated submodules. stable_1389286933
Qt Submodule Update Bot [Thu, 9 Jan 2014 01:33:40 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
6 years agoUpdated submodules. stable_1388647506
Qt Submodule Update Bot [Wed, 1 Jan 2014 01:33:43 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1387519987
Qt Submodule Update Bot [Fri, 20 Dec 2013 01:33:43 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1387190468
Qt Submodule Update Bot [Mon, 16 Dec 2013 09:33:41 +0000 (11:33 +0200)]
Updated submodules.

Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agotry to make the ChangeLog template more inviting stable_1385821674
Oswald Buddenhagen [Mon, 25 Nov 2013 10:45:03 +0000 (11:45 +0100)]
try to make the ChangeLog template more inviting

move it even futher up and encourage integrating it into the rest of the
commit message.

Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoUpdated submodules. stable_1384099895
Qt Submodule Update Bot [Sun, 10 Nov 2013 01:33:34 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383736831
Qt Submodule Update Bot [Wed, 6 Nov 2013 01:33:44 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383653202
Qt Submodule Update Bot [Tue, 5 Nov 2013 11:53:42 +0000 (13:53 +0200)]
Updated submodules.

Change-Id: Ib742f171c913b182d699270890599e3628d5df10
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383601840
Qt Submodule Update Bot [Mon, 4 Nov 2013 17:33:49 +0000 (19:33 +0200)]
Updated submodules.

Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383549318
Qt Submodule Update Bot [Mon, 4 Nov 2013 06:07:31 +0000 (08:07 +0200)]
Updated submodules.

Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoAdd qtenginio as submodule stable_1383309576
Frederik Gladhorn [Thu, 24 Oct 2013 10:30:47 +0000 (12:30 +0200)]
Add qtenginio as submodule

Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
6 years agoUpdated submodules. stable_1383289035
Qt Submodule Update Bot [Fri, 1 Nov 2013 01:32:29 +0000 (03:32 +0200)]
Updated submodules.

Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
6 years agoUpdated submodules. stable_1383247571
Qt Submodule Update Bot [Thu, 31 Oct 2013 17:32:18 +0000 (19:32 +0200)]
Updated submodules.

Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
6 years agoUpdated submodules. stable_1383213929
Qt Submodule Update Bot [Thu, 31 Oct 2013 01:32:29 +0000 (03:32 +0200)]
Updated submodules.

Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
7 years agoRefine qt-module dependencies for massively parallel builds stable_1382633473
Allan Sandfeld Jensen [Mon, 21 Oct 2013 15:30:39 +0000 (17:30 +0200)]
Refine qt-module dependencies for massively parallel builds

QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.

QtScript should be build after QtTools because an example uses UiTools.

Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoUpdated submodules. stable_1382412638 v5.2.0-beta1
Qt Submodule Update Bot [Tue, 22 Oct 2013 00:32:41 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. stable_1381941616
Qt Submodule Update Bot [Wed, 16 Oct 2013 14:15:33 +0000 (17:15 +0300)]
Updated submodules.

Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1381865763
Qt Submodule Update Bot [Tue, 15 Oct 2013 19:00:06 +0000 (22:00 +0300)]
Updated submodules.

Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1381614990
Qt Submodule Update Bot [Sat, 12 Oct 2013 16:33:01 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoIgnore auto-generated file .qmake.super stable_1381240031
Mandeep Sandhu [Mon, 16 Sep 2013 11:13:33 +0000 (16:43 +0530)]
Ignore auto-generated file .qmake.super

Added rule in .gitignore for .qmake.super.
This file is generated when building Qt from the root dir.

Task-number: QTBUG-33439
Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agomove changelog entry before the real footers
Oswald Buddenhagen [Mon, 30 Sep 2013 16:17:00 +0000 (18:17 +0200)]
move changelog entry before the real footers

the change-id will be added at the end, which will look just plain
stupid if the other "real" footers come above the changelog.
also, a smart log author would integrate the changelog entry into the
flow of the message, so further up in the template is more natural.

Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoqt.pro: Fix dependencies for qtconnectivity
Sergio Ahumada [Tue, 24 Sep 2013 14:26:03 +0000 (16:26 +0200)]
qt.pro: Fix dependencies for qtconnectivity

Remove the hard dependency on qtsystems and changing it
with a hard dependency on qtbase and a optional dependency
on qtdeclarative instead.

Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
7 years agoUpdated submodules. stable_1381222355
Qt Submodule Update Bot [Tue, 8 Oct 2013 08:32:57 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMark qtmultimedia as an optional dependency for qtwinextras
J-P Nurmi [Mon, 7 Oct 2013 08:27:10 +0000 (10:27 +0200)]
Mark qtmultimedia as an optional dependency for qtwinextras

The QtWinExtras Music Player example uses QtMultimedia.

Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 7 Oct 2013 00:33:01 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd new qtandroidextras repository v5.2.0-alpha1
Sergio Ahumada [Mon, 23 Sep 2013 10:51:56 +0000 (12:51 +0200)]
Add new qtandroidextras repository

Also adding it as part of the default modules.

Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
7 years agoAdd qtmacextras#stable as part of the default modules
Sergio Ahumada [Mon, 23 Sep 2013 10:46:45 +0000 (12:46 +0200)]
Add qtmacextras#stable as part of the default modules

Also updating the sha1 to the latest one that has passed
the CI already.

Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
7 years agoUpdated submodules. stable_1380177164
Qt Submodule Update Bot [Thu, 26 Sep 2013 00:32:08 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge branch 'dev' into stable
Sergio Ahumada [Mon, 23 Sep 2013 10:24:59 +0000 (12:24 +0200)]
Merge branch 'dev' into stable

Conflicts:
qtjsbackend

7 years agoUpdated submodules. dev_1379710103
Sergio Ahumada [Fri, 20 Sep 2013 13:05:30 +0000 (15:05 +0200)]
Updated submodules.

Change-Id: Iaaf1ec8b87ff1558d0cd5025bd4faf39a1b21e77
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd qtlocation#dev as part of the default modules dev_1379659786
Sergio Ahumada [Tue, 10 Sep 2013 11:05:55 +0000 (13:05 +0200)]
Add qtlocation#dev as part of the default modules

Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
7 years agoUpdated qtlocation submodule dev_1379599717
Sergio Ahumada [Thu, 19 Sep 2013 08:11:45 +0000 (10:11 +0200)]
Updated qtlocation submodule

Change-Id: I40d980381231ed8a5103200b82570f284915e121
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1379350080
Qt Submodule Update Bot [Mon, 16 Sep 2013 16:32:58 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1379069215
Qt Submodule Update Bot [Fri, 13 Sep 2013 10:33:23 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: I3840892d83b4c825c0a19a4326f5f392a2352585
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev dev_1378969472
Sergio Ahumada [Thu, 12 Sep 2013 07:02:30 +0000 (09:02 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

7 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 12 Sep 2013 02:33:06 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: Iea9702923e86fc3decadbc831e31b349bd40ac44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge branch 'stable' into dev dev_1378902914 dev_1378920809 dev_1378966022 91/65191/1
Sergio Ahumada [Wed, 11 Sep 2013 11:31:09 +0000 (13:31 +0200)]
Merge branch 'stable' into dev

Conflicts:
qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82

7 years agoUpdated submodules. dev_1378838607
Qt Submodule Update Bot [Tue, 10 Sep 2013 18:33:20 +0000 (21:33 +0300)]
Updated submodules.

Change-Id: I70c2051332bb3404f4a63ec3ddc16e22bde13bd9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd qtconnectivity#dev as part of the default modules
Sergio Ahumada [Tue, 10 Sep 2013 11:05:08 +0000 (13:05 +0200)]
Add qtconnectivity#dev as part of the default modules

Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
7 years agoUpdated submodules. dev_1378725659
Qt Submodule Update Bot [Mon, 9 Sep 2013 10:32:31 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: I85d30ddaa31fc6067d5741286c056981eec1a7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1378469291
Qt Submodule Update Bot [Fri, 6 Sep 2013 11:30:15 +0000 (14:30 +0300)]
Updated submodules.

Change-Id: I6ca2fbea871d34e2dcd8f616599c34da7fe6f8dc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1377937492
Qt Submodule Update Bot [Sat, 31 Aug 2013 00:32:18 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd qtwinextras#dev as part of the default modules dev_1377789968
Sergio Ahumada [Mon, 26 Aug 2013 10:39:50 +0000 (12:39 +0200)]
Add qtwinextras#dev as part of the default modules

Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
7 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 29 Aug 2013 10:32:33 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: Ib6faaac71302be0c47b9904be5481c4b281e9008
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd ChangeLog template. stable_1377500040
Frederik Gladhorn [Tue, 20 Aug 2013 15:00:20 +0000 (17:00 +0200)]
Add ChangeLog template.

Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoUpdated submodules. dev_1377110577
Qt Submodule Update Bot [Wed, 21 Aug 2013 18:33:03 +0000 (21:33 +0300)]
Updated submodules.

Change-Id: Ifb2020a44f9cddd7b969e038c611bf7cbadfeac8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoAdd --oslo option to init-repository stable_1377071156
Alex Blasche [Wed, 14 Aug 2013 06:41:58 +0000 (08:41 +0200)]
Add --oslo option to init-repository

Oslo devs can use a local git mirror.

Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
7 years agoCleanup of init-repository stable_1376980739
Alex Blasche [Wed, 14 Aug 2013 06:37:40 +0000 (08:37 +0200)]
Cleanup of init-repository

Removes old Nokia URLs and options associated with Nokia infrastructure

Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agopurge qtjsbackend dev_1376694331
Oswald Buddenhagen [Fri, 16 Aug 2013 18:10:09 +0000 (20:10 +0200)]
purge qtjsbackend

Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1376600968
Qt Submodule Update Bot [Thu, 15 Aug 2013 18:33:06 +0000 (21:33 +0300)]
Updated submodules.

Change-Id: Ie3de6338ce0362c3d85ebb06e7b304521b27a1bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1376398487
Qt Submodule Update Bot [Tue, 13 Aug 2013 10:33:05 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: Iad241de71b1302fedbe37c20fad2da71632ec46f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoRemove qtjsbackend as dependency for qtdeclarative dev_1376355239
Simon Hausmann [Wed, 7 Aug 2013 10:09:46 +0000 (12:09 +0200)]
Remove qtjsbackend as dependency for qtdeclarative

This is the first step. The next step is to remove it from qtdeclarative's
sync.profile after this integrates.

Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoUpdated submodules. dev_1376333510
Qt Submodule Update Bot [Mon, 12 Aug 2013 18:49:21 +0000 (21:49 +0300)]
Updated submodules.

Change-Id: I51c0a11ff3a3914cac1baf2a4fa6ef826089860f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1375867205
Qt Submodule Update Bot [Wed, 7 Aug 2013 08:32:54 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoDoc: specified how to install documentation stable_1375788997
Nico Vertriest [Fri, 5 Jul 2013 12:55:14 +0000 (14:55 +0200)]
Doc: specified how to install documentation

Added command "make install_docs"

Task-number: QTBUG-32212
Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
7 years agoqtwinextras: add qtdeclarative as an optional dependency stable_1375636134
J-P Nurmi [Fri, 2 Aug 2013 08:35:30 +0000 (10:35 +0200)]
qtwinextras: add qtdeclarative as an optional dependency

qtwinextras contains optional QML types, so qtdeclarative must
be listed as an optional dependency to avoid build breaks.

Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoUpdated submodules. stable_1375159544
Qt Submodule Update Bot [Tue, 30 Jul 2013 00:32:24 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1375096990
Qt Submodule Update Bot [Mon, 29 Jul 2013 10:32:41 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: Id06469a62635d263631c308ffa2d16a794a6b75f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1374682509
Qt Submodule Update Bot [Wed, 24 Jul 2013 10:32:29 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: I292fa5832ffb6890479a220ee07c7020f313537c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1374639765
Qt Submodule Update Bot [Tue, 23 Jul 2013 18:32:24 +0000 (21:32 +0300)]
Updated submodules.

Change-Id: If5e182de18267e8d54919b7e20d650582ff3f467
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. stable_1374568473
Qt Submodule Update Bot [Tue, 23 Jul 2013 08:32:23 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1374396981
Qt Submodule Update Bot [Sun, 21 Jul 2013 08:32:10 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I6493c3d8137a4659814949f96465d374dbad1781
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1374365020
Qt Submodule Update Bot [Sat, 20 Jul 2013 10:32:35 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: I0927a9a0f8b0cedac8027eec865d3e2118078054
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1374338510
Qt Submodule Update Bot [Sat, 20 Jul 2013 16:32:24 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1374308373
Qt Submodule Update Bot [Fri, 19 Jul 2013 16:32:14 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1374235268
Qt Submodule Update Bot [Fri, 19 Jul 2013 10:32:30 +0000 (13:32 +0300)]
Updated submodules.

Change-Id: If350c3bb5172d5de13a162e9e5ba2720eb890c14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1374146459
Qt Submodule Update Bot [Thu, 18 Jul 2013 00:32:13 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1374067130
Qt Submodule Update Bot [Wed, 17 Jul 2013 00:32:39 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1373793045
Qt Submodule Update Bot [Sun, 14 Jul 2013 02:32:23 +0000 (05:32 +0300)]
Updated submodules.

Change-Id: Ia289ec8a0390ff4c0b957cd7f4d7c8cd726e2d1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev
Sergio Ahumada [Sun, 14 Jul 2013 09:07:55 +0000 (11:07 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

7 years agoUpdated submodules. stable_1373710582
Qt Submodule Update Bot [Sat, 13 Jul 2013 08:32:21 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I0b24bc3851237425f0738df422a20ade09095681
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1373667795
Qt Submodule Update Bot [Fri, 12 Jul 2013 20:43:09 +0000 (23:43 +0300)]
Updated submodules.

Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1373561544
Qt Submodule Update Bot [Thu, 11 Jul 2013 16:32:29 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge branch 'stable' into dev dev_1373544554 04/60904/1
Sergio Ahumada [Thu, 11 Jul 2013 11:29:44 +0000 (13:29 +0200)]
Merge branch 'stable' into dev

Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtxmlpatterns

Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1

7 years agoUpdated submodules. stable_1373496607
Qt Submodule Update Bot [Wed, 10 Jul 2013 22:47:52 +0000 (01:47 +0300)]
Updated submodules.

Change-Id: I8e11fdb9392d8fcff7b1b1b2673891ea77d6cf0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1373477015
Qt Submodule Update Bot [Wed, 10 Jul 2013 16:32:22 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: I9b68559f3cc82db32e93d4040fa2b17f8315397b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoleave makefile generation to the real configure stable_1373430753
Oswald Buddenhagen [Tue, 18 Jun 2013 13:14:30 +0000 (15:14 +0200)]
leave makefile generation to the real configure

call it with the "secret" -top-level option, which shifts the makefile
generation one level up.

this makes the configure call the last thing we do, thus also avoiding
the problems we had with the -help switch (and the previous attempts at
fixing it).

Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoUpdated submodules. stable_1373341148
Qt Submodule Update Bot [Tue, 9 Jul 2013 00:31:57 +0000 (03:31 +0300)]
Updated submodules.

Change-Id: I20ecf7efa58302efc96b80a1da136a19e4946f4b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1373054628
Qt Submodule Update Bot [Fri, 5 Jul 2013 19:43:19 +0000 (22:43 +0300)]
Updated submodules.

Change-Id: I5ae49dac5a57f3a691713781a7f5390a44d6c8ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1372771253
Qt Submodule Update Bot [Tue, 2 Jul 2013 08:32:14 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I0e9f726baf60c4af7caa2ef403f087cb915b420b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1372516094
Qt Submodule Update Bot [Sat, 29 Jun 2013 00:32:05 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd qtmacextras and qtwinextras to qt5.git#stable stable_1372220144
Sergio Ahumada [Tue, 25 Jun 2013 10:21:30 +0000 (12:21 +0200)]
Add qtmacextras and qtwinextras to qt5.git#stable

Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoMerge branch 'stable' into dev dev_1372107206 15/59715/1
Sergio Ahumada [Mon, 24 Jun 2013 16:34:07 +0000 (18:34 +0200)]
Merge branch 'stable' into dev

Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtx11extras
qtxmlpatterns

Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527

7 years agoMerge branch 'release' into stable stable_1372071952 39/59639/1
Sergio Ahumada [Mon, 24 Jun 2013 06:39:37 +0000 (08:39 +0200)]
Merge branch 'release' into stable

Conflicts:
qtbase
qtdeclarative
qtmultimedia
qtquick1
qtquickcontrols
qtsensors
qttools

Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267

7 years agoconfigure: Fix srcpath when you run configure in the top-level dir release_1372025997
Sergio Ahumada [Sun, 23 Jun 2013 09:15:32 +0000 (11:15 +0200)]
configure: Fix srcpath when you run configure in the top-level dir

Using the absolute path to configure, otherwise you get:

  [user@locahost qt5]$ ./configure -minimal
  + cd qtbase
  + ./qtbase/configure -minimal
  ./configure: line 58: ./qtbase/configure: No such file or directory

Change-Id: Ic7568cc571aaa52c56bcd28fa1b6bde8abb32c8e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoMerge "Merge branch 'release' into stable" into refs/staging/stable stable_1371990388
Frederik Gladhorn [Sun, 23 Jun 2013 12:17:44 +0000 (14:17 +0200)]
Merge "Merge branch 'release' into stable" into refs/staging/stable

7 years agoUpdated submodules. release_1371932342
Qt Submodule Update Bot [Sat, 22 Jun 2013 20:16:25 +0000 (23:16 +0300)]
Updated submodules.

Change-Id: I375328584b6361cd9f364be05b29afa5f33ac318
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1371921952
Qt Submodule Update Bot [Sat, 22 Jun 2013 08:32:13 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I6670595185ea486237fe71c156e081ffe8bb40cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1371890461
Qt Submodule Update Bot [Sat, 22 Jun 2013 02:32:23 +0000 (05:32 +0300)]
Updated submodules.

Change-Id: I7124fb036a5cdbc24eb8f818493deb2d13d1fe2d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agofix Berlin's mirror URL stable_1371850015
Joerg Bornemann [Wed, 19 Jun 2013 10:58:50 +0000 (12:58 +0200)]
fix Berlin's mirror URL

Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
7 years agoUpdated submodules. dev_1371842831
Qt Submodule Update Bot [Fri, 21 Jun 2013 18:32:17 +0000 (21:32 +0300)]
Updated submodules.

Change-Id: If828e05a91be62763bb1872ba828f71012c96b06
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1371831851
Qt Submodule Update Bot [Fri, 21 Jun 2013 00:32:11 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I6a60f386b899ec6a55dd780c40fa03f2738778de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoRemove JsonDB from QtSystems and QtLocation dependency list dev_1371795142
Alex Blasche [Wed, 12 Jun 2013 10:31:53 +0000 (12:31 +0200)]
Remove JsonDB from QtSystems and QtLocation dependency list

There is no optional jsondb build anymore

Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agoMerge branch 'release' into stable 52/59152/3
Sergio Ahumada [Thu, 20 Jun 2013 20:53:54 +0000 (22:53 +0200)]
Merge branch 'release' into stable

Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtx11extras
qtxmlpatterns

Change-Id: I3abc0b033809366c993b0c358575e120c4f5953b

7 years agorewrite top-level configures without perl release_1371733202
Oswald Buddenhagen [Tue, 18 Jun 2013 15:10:00 +0000 (17:10 +0200)]
rewrite top-level configures without perl

otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would
be fairly useless for top-level builds.

Task-number: QTBUG-31786
Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>