qt:qt5.git
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 13 May 2014 16:33:36 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 4 May 2014 08:33:33 +0000 (11:33 +0300)]
Updated submodules.

Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 26 Apr 2014 00:33:58 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 9 Apr 2014 15:30:15 +0000 (18:30 +0300)]
Updated submodules.

Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 4 Apr 2014 16:33:28 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 3 Apr 2014 00:33:55 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 1 Apr 2014 16:33:32 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 28 Mar 2014 01:34:40 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 27 Mar 2014 17:51:14 +0000 (19:51 +0200)]
Updated submodules.

Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 26 Mar 2014 01:34:58 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules. v5.3.0-beta1
Qt Submodule Update Bot [Sat, 22 Mar 2014 01:33:37 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoAdd qtenginio#stable as part of the default modules
Sergio Ahumada [Mon, 17 Mar 2014 16:08:16 +0000 (17:08 +0100)]
Add qtenginio#stable as part of the default modules

Also update qtenginio to the latest stable sha1.

Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 21 Mar 2014 08:29:24 +0000 (10:29 +0200)]
Updated submodules.

Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 19 Mar 2014 18:51:39 +0000 (20:51 +0200)]
Updated submodules.

Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 18 Mar 2014 01:33:34 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 16 Mar 2014 01:33:24 +0000 (03:33 +0200)]
Updated submodules.

Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 15 Mar 2014 12:59:43 +0000 (14:59 +0200)]
Updated submodules.

Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 9 Mar 2014 17:34:18 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 7 Mar 2014 17:34:18 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 6 Mar 2014 17:34:23 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 5 Mar 2014 17:34:29 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 4 Mar 2014 09:34:55 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 3 Mar 2014 01:34:18 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
4 years agoautomatically install hooks
Oswald Buddenhagen [Mon, 10 Feb 2014 20:30:52 +0000 (21:30 +0100)]
automatically install hooks

Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 28 Feb 2014 01:34:16 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules. v5.3.0-alpha1
Qt Submodule Update Bot [Wed, 26 Feb 2014 05:33:29 +0000 (07:33 +0200)]
Updated submodules.

Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a

4 years agonuke qlalr submodule
Oswald Buddenhagen [Wed, 5 Feb 2014 17:48:20 +0000 (18:48 +0100)]
nuke qlalr submodule

it was merged back into qtbase.

Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 21 Feb 2014 01:34:36 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoremove reviewed-by template
Oswald Buddenhagen [Tue, 18 Feb 2014 16:58:00 +0000 (17:58 +0100)]
remove reviewed-by template

unlike previously thought, gerrit does not remove recognized reviewers
who did not actually make a review. so better not suggest adding
potentially misleading footers.

Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15

4 years agoMerge remote-tracking branch 'gerrit/dev' into stable
Oswald Buddenhagen [Wed, 19 Feb 2014 15:13:02 +0000 (16:13 +0100)]
Merge remote-tracking branch 'gerrit/dev' into stable

Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c

4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 17 Feb 2014 17:34:17 +0000 (19:34 +0200)]
Updated submodules.

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

This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that

Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 16 Feb 2014 01:34:18 +0000 (03:34 +0200)]
Updated submodules.

Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 15 Feb 2014 11:34:21 +0000 (13:34 +0200)]
Updated submodules.

Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 15 Feb 2014 09:34:13 +0000 (11:34 +0200)]
Updated submodules.

Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 13 Feb 2014 08:08:51 +0000 (10:08 +0200)]
Updated submodules.

Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 10 Feb 2014 03:34:05 +0000 (05:34 +0200)]
Updated submodules.

Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev
Friedemann Kleint [Thu, 6 Feb 2014 07:46:01 +0000 (08:46 +0100)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 5 Feb 2014 11:38:12 +0000 (13:38 +0200)]
Updated submodules.

Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
4 years agoMerge branch 'stable' into dev
Frederik Gladhorn [Wed, 29 Jan 2014 12:50:59 +0000 (13:50 +0100)]
Merge branch 'stable' into dev

Conflicts:
qtactiveqt
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5

4 years agodon't unnecessarily confuse qt creator
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoAdd QtAndroidExtras to dependency list of QtConnectivity
Alex Blasche [Thu, 28 Nov 2013 11:12:45 +0000 (12:12 +0100)]
Add QtAndroidExtras to dependency list of QtConnectivity

We only need it for Android builds though.

Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 11 Jan 2014 03:33:56 +0000 (05:33 +0200)]
Updated submodules.

Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 9 Jan 2014 03:33:54 +0000 (05:33 +0200)]
Updated submodules.

Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 16 Dec 2013 11:33:30 +0000 (13:33 +0200)]
Updated submodules.

Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
4 years agoUpdated submodules.
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>
4 years agotry to make the ChangeLog template more inviting
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoAdd qtenginio as submodule
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoRefine qt-module dependencies for massively parallel builds
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>
4 years agoUpdated submodules. 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>
4 years agoUpdated submodules.
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>
4 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev
Sergio Ahumada [Wed, 16 Oct 2013 10:39:27 +0000 (12:39 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 15 Oct 2013 18:33:14 +0000 (21:33 +0300)]
Updated submodules.

Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Tue, 15 Oct 2013 08:01:01 +0000 (10:01 +0200)]
Merge branch 'stable' into dev

Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8

4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 14 Oct 2013 10:33:20 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoUpdated submodules.
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>
4 years agoIgnore auto-generated file .qmake.super
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>
4 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>
4 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>
4 years agoUpdated submodules.
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>
4 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>
4 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>
4 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>
4 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>
4 years agoUpdated submodules.
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>
4 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

4 years agoUpdated submodules.
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>
4 years agoAdd qtlocation#dev as part of the default modules
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>
4 years agoUpdated qtlocation submodule
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev
Sergio Ahumada [Thu, 12 Sep 2013 07:02:30 +0000 (09:02 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

4 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>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Wed, 11 Sep 2013 11:31:09 +0000 (13:31 +0200)]
Merge branch 'stable' into dev

Conflicts:
qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82

4 years agoUpdated submodules.
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>
4 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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoUpdated submodules.
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>
4 years agoAdd qtwinextras#dev as part of the default modules
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>
4 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>
4 years agoAdd ChangeLog template.
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>
4 years agoUpdated submodules.
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>
4 years agoAdd --oslo option to init-repository
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>