mirror/qt/qt5.git
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 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 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. 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. 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. 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. 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. 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 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 '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 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. 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 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>
7 years agoDon't include README.git in source packages release_1371553129
Sergio Ahumada [Mon, 17 Jun 2013 11:18:59 +0000 (13:18 +0200)]
Don't include README.git in source packages

It doesn't make sense for non-git content anyways.

Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. stable_1371494447
Qt Submodule Update Bot [Mon, 17 Jun 2013 16:32:41 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: I511255ebfd7e046391e4b3f03f06f7ba84597cdb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1371479215
Qt Submodule Update Bot [Mon, 17 Jun 2013 14:24:28 +0000 (17:24 +0300)]
Updated submodules.

Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdate LICENSE.PREVIEW.COMMERCIAL license release_1371454050
Sergio Ahumada [Wed, 12 Jun 2013 13:54:06 +0000 (15:54 +0200)]
Update LICENSE.PREVIEW.COMMERCIAL license

Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. release_1371389081
Qt Submodule Update Bot [Sun, 16 Jun 2013 11:32:37 +0000 (14:32 +0300)]
Updated submodules.

Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1371270233 v5.1.0-rc1
Sergio Ahumada [Fri, 14 Jun 2013 17:45:20 +0000 (19:45 +0200)]
Updated submodules.

Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1371198909
Qt Submodule Update Bot [Fri, 14 Jun 2013 08:32:43 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I188bb452fd59f6c0b4be329fd82f88f603daae0f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1371102931
Qt Submodule Update Bot [Wed, 12 Jun 2013 19:32:46 +0000 (22:32 +0300)]
Updated submodules.

Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1370939688
Qt Submodule Update Bot [Tue, 11 Jun 2013 08:48:27 +0000 (11:48 +0300)]
Updated submodules.

Change-Id: I3a770f5d4569edf4056b883d6533a7f4584b0ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370923451
Qt Submodule Update Bot [Tue, 11 Jun 2013 03:32:51 +0000 (06:32 +0300)]
Updated submodules.

Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370760582
Qt Submodule Update Bot [Sun, 9 Jun 2013 03:32:41 +0000 (06:32 +0300)]
Updated submodules.

Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370651015
Qt Submodule Update Bot [Fri, 7 Jun 2013 19:32:40 +0000 (22:32 +0300)]
Updated submodules.

Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370548861
Qt Submodule Update Bot [Thu, 6 Jun 2013 19:32:34 +0000 (22:32 +0300)]
Updated submodules.

Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370445019
Qt Submodule Update Bot [Wed, 5 Jun 2013 11:32:38 +0000 (14:32 +0300)]
Updated submodules.

Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. release_1370329156
Qt Submodule Update Bot [Tue, 4 Jun 2013 03:32:37 +0000 (06:32 +0300)]
Updated submodules.

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

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

Change-Id: I3b9d57e4133feb47d847b928cfe54e2e15f1a186
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1370000981
Qt Submodule Update Bot [Fri, 31 May 2013 11:07:22 +0000 (14:07 +0300)]
Updated submodules.

Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369993820
Qt Submodule Update Bot [Fri, 31 May 2013 09:44:49 +0000 (12:44 +0300)]
Updated submodules.

Change-Id: I90ca6825c475bd22822edb3e95f78dcc5504038e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd license files mandated by (L)GPL. release_1369946063
Sergio Ahumada [Wed, 29 May 2013 12:33:02 +0000 (14:33 +0200)]
Add license files mandated by (L)GPL.

Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
7 years agoUpdated submodules. release_1369825866
Qt Submodule Update Bot [Wed, 29 May 2013 11:01:16 +0000 (14:01 +0300)]
Updated submodules.

Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1369740753
Sergio Ahumada [Tue, 28 May 2013 11:22:15 +0000 (13:22 +0200)]
Updated submodules.

Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. stable_1369722618
Qt Submodule Update Bot [Tue, 28 May 2013 00:32:34 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I4fcad903b132fa253bbc202463d99fceae64b220
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369657241
Qt Submodule Update Bot [Mon, 27 May 2013 12:17:53 +0000 (15:17 +0300)]
Updated submodules.

Change-Id: I7627c87948ff36902852a491177bd6ce9a9c6875
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369639568
Qt Submodule Update Bot [Mon, 27 May 2013 00:33:23 +0000 (03:33 +0300)]
Updated submodules.

Change-Id: I7e979b67af985dcd16b12199d3b8d29a6a0f5438
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369587876
Qt Submodule Update Bot [Sun, 26 May 2013 16:32:32 +0000 (19:32 +0300)]
Updated submodules.

Change-Id: I47fb446cbe5c8d85fbe29168adddd80abdc4963f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369541374
Qt Submodule Update Bot [Sun, 26 May 2013 00:32:27 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: Ieafc5686a62071ab835129ba97860ae13979758f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369442115
Qt Submodule Update Bot [Sat, 25 May 2013 00:32:26 +0000 (03:32 +0300)]
Updated submodules.

Change-Id: I7473ab6b3c111bbbce8a53420ee196b614850dc2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369423128
Qt Submodule Update Bot [Fri, 24 May 2013 19:16:51 +0000 (22:16 +0300)]
Updated submodules.

Change-Id: I123cf8b2cb48921ac0eb73786efc1ddc3a7b4826
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369405778
Qt Submodule Update Bot [Fri, 24 May 2013 14:25:41 +0000 (17:25 +0300)]
Updated submodules.

Change-Id: Ibbc5dca735c3651ea01e6fd860348a2ad841ae1a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369387784
Qt Submodule Update Bot [Fri, 24 May 2013 09:27:44 +0000 (12:27 +0300)]
Updated submodules.

Change-Id: Ibb9e60870c825fa336e1816f2402d72df4efabaa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369341619
Qt Submodule Update Bot [Thu, 23 May 2013 19:56:31 +0000 (22:56 +0300)]
Updated submodules.

Change-Id: Icbe70b9b60cb57634b6ef3e07f34983e6cc2738f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369320289
Qt Submodule Update Bot [Thu, 23 May 2013 14:41:44 +0000 (17:41 +0300)]
Updated submodules.

Change-Id: I3814e96edd8db204eb93396c46b5d2812fb8898d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMerge branch 'stable' into release release_1369318896 release_1369322913 release_1369327257 35/56835/1
Sergio Ahumada [Thu, 23 May 2013 13:30:52 +0000 (15:30 +0200)]
Merge branch 'stable' into release

Conflicts:
README
qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53

7 years agoUpdated submodules. stable_1369301502
Qt Submodule Update Bot [Thu, 23 May 2013 08:32:25 +0000 (11:32 +0300)]
Updated submodules.

Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369262940
Qt Submodule Update Bot [Wed, 22 May 2013 22:46:43 +0000 (01:46 +0300)]
Updated submodules.

Change-Id: I38dc5b49f6ba2b0c7053856ee815d58d7e2decd2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1369245409
Qt Submodule Update Bot [Wed, 22 May 2013 16:33:14 +0000 (19:33 +0300)]
Updated submodules.

Change-Id: Ie78aad71e6d584fc4b8f0a831ed74370d85201ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated qtquickcontrols submodule. stable_1368292149 v5.1.0-beta1
Sergio Ahumada [Sat, 11 May 2013 16:59:41 +0000 (18:59 +0200)]
Updated qtquickcontrols submodule.

Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. stable_1368095069
Qt Submodule Update Bot [Wed, 8 May 2013 10:18:04 +0000 (12:18 +0200)]
Updated submodules.

Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agouse relative submodule specs stable_1367381646
Oswald Buddenhagen [Tue, 30 Apr 2013 09:29:49 +0000 (11:29 +0200)]
use relative submodule specs

this saves various trouble.
this syntax is supported since git 1.7.0.

Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
7 years agorenamed qtwebkit-examples-and-demos => qtwebkit-examples
Oswald Buddenhagen [Tue, 30 Apr 2013 09:23:38 +0000 (11:23 +0200)]
renamed qtwebkit-examples-and-demos => qtwebkit-examples

Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
7 years agoUpdated submodules. stable_1367270330
Qt Submodule Update Bot [Mon, 29 Apr 2013 15:41:26 +0000 (18:41 +0300)]
Updated submodules.

Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366562799
Qt Submodule Update Bot [Sun, 21 Apr 2013 16:38:14 +0000 (19:38 +0300)]
Updated submodules.

Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366421165
Qt Submodule Update Bot [Sat, 20 Apr 2013 00:38:18 +0000 (03:38 +0300)]
Updated submodules.

Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoskip modules whose mandatory dependencies are missing stable_1366308582
Oswald Buddenhagen [Wed, 17 Apr 2013 09:25:38 +0000 (11:25 +0200)]
skip modules whose mandatory dependencies are missing

so that for example "-skip webkit" will also skip qtwebkit-examples.

Task-number: QTBUG-30307
Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
7 years agoUpdated submodules. stable_1366281907
Qt Submodule Update Bot [Thu, 18 Apr 2013 08:38:21 +0000 (11:38 +0300)]
Updated submodules.

Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366216827
Qt Submodule Update Bot [Wed, 17 Apr 2013 16:38:24 +0000 (19:38 +0300)]
Updated submodules.

Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366200346
Qt Submodule Update Bot [Wed, 17 Apr 2013 08:41:01 +0000 (11:41 +0300)]
Updated submodules.

Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1365503337
Qt Submodule Update Bot [Mon, 8 Apr 2013 16:20:13 +0000 (19:20 +0300)]
Updated submodules.

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

Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd new modules (qtquickcontrols, qtserialport and qtx11extras) stable_1365089245 v5.1.0-alpha1
Sergio Ahumada [Thu, 4 Apr 2013 05:37:42 +0000 (07:37 +0200)]
Add new modules (qtquickcontrols, qtserialport and qtx11extras)

Also adding qtsensors as part of the default modules and updating
its sha1.

Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org>
7 years agoUpdated submodules. release_1365064483
Qt Submodule Update Bot [Wed, 3 Apr 2013 13:26:37 +0000 (16:26 +0300)]
Updated submodules.

Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agore-add a bunch of modules stable_1365014934
Oswald Buddenhagen [Mon, 3 Dec 2012 13:07:32 +0000 (14:07 +0100)]
re-add a bunch of modules

this allows for easy cloning and build system maintenance also for
modules which are currently irrelevant, thus hopefully keeping the
barrier to their revival low. it does not affect the casual developer or
the CI system, as init-repository will not clone these modules.

This (abstractly) reverts commits
41c3f2cb5f633f0e540482ca01b2c2caa2475e57,
725a51b1d83626e16989804707356baa909c339f and
1117d4da2caf1989f63ca0a8073a799df80428bc.

Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoclone only a specific subset of repositories by default
Oswald Buddenhagen [Fri, 2 Nov 2012 19:59:30 +0000 (20:59 +0100)]
clone only a specific subset of repositories by default

the list corresponds to the current contents of .gitmodules.
this will allow us to re-add more modules to the supermodule without
bothering people and the qt5 integration with unmaintained modules.

Change-Id: I8bc429fed8e4d1f729b375b302531472d3c4e267
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1364647472
Qt Submodule Update Bot [Sat, 30 Mar 2013 12:36:35 +0000 (14:36 +0200)]
Updated submodules.

Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1364398466
Qt Submodule Update Bot [Wed, 27 Mar 2013 14:51:02 +0000 (16:51 +0200)]
Updated submodules.

Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1364296166
Qt Submodule Update Bot [Tue, 26 Mar 2013 11:04:31 +0000 (13:04 +0200)]
Updated submodules.

Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1364235580
Qt Submodule Update Bot [Mon, 25 Mar 2013 14:38:20 +0000 (16:38 +0200)]
Updated submodules.

Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1364204554
Qt Submodule Update Bot [Mon, 25 Mar 2013 09:26:27 +0000 (11:26 +0200)]
Updated submodules.

Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1363957944
Qt Submodule Update Bot [Fri, 22 Mar 2013 13:05:34 +0000 (15:05 +0200)]
Updated submodules.

Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1363698821
Qt Submodule Update Bot [Tue, 19 Mar 2013 12:37:53 +0000 (14:37 +0200)]
Updated submodules.

Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. release_1362490297
Qt Submodule Update Bot [Mon, 4 Mar 2013 20:45:45 +0000 (22:45 +0200)]
Updated submodules.

Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
7 years agoUpdated submodules. stable_1361990777
Qt Submodule Update Bot [Wed, 27 Feb 2013 17:36:29 +0000 (19:36 +0200)]
Updated submodules.

Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9
Reviewed-by: Liang Qi <liang.qi@digia.com>
7 years agoREADME: Update with the reference platforms and remove the mingw entry stable_1361582189
Laszlo Papp [Fri, 22 Feb 2013 07:51:57 +0000 (07:51 +0000)]
README: Update with the reference platforms and remove the mingw entry

Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
7 years agomake it possible to explicitly exclude particular modules stable_1361399706
Oswald Buddenhagen [Wed, 20 Feb 2013 09:36:36 +0000 (10:36 +0100)]
make it possible to explicitly exclude particular modules

Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agosemi-automate adding submodules
Oswald Buddenhagen [Wed, 20 Feb 2013 09:33:49 +0000 (10:33 +0100)]
semi-automate adding submodules

this way adding a module actually becomes a one-liner

Change-Id: Ie31039d36e948094c3ec241758eaab330304b194
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agodon't make webkit build conditional on ICU
Oswald Buddenhagen [Wed, 20 Feb 2013 09:39:57 +0000 (10:39 +0100)]
don't make webkit build conditional on ICU

webkit now contains its own configure magic to disable itself.

Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. release_1359537342
Qt Submodule Update Bot [Tue, 29 Jan 2013 20:45:27 +0000 (22:45 +0200)]
Updated submodules.

Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>