summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules62
-rwxr-xr-xinit-repository2
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcanvas3d0
m---------qtconnectivity0
m---------qtdeclarative0
m---------qtdoc0
m---------qtenginio0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtqa0
m---------qtquick10
m---------qtquickcontrols0
m---------qtrepotools0
m---------qtscript0
m---------qtsensors0
m---------qtserialport0
m---------qtsvg0
m---------qtsystems0
m---------qttools0
m---------qttranslations0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebkit0
m---------qtwebkit-examples0
m---------qtwebsockets0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
36 files changed, 32 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules
index ef08ab13..90a794c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,52 +1,52 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtsvg"]
path = qtsvg
url = ../qtsvg.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtdeclarative"]
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtactiveqt"]
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtscript"]
path = qtscript
url = ../qtscript.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtmultimedia"]
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qttools"]
path = qttools
url = ../qttools.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtxmlpatterns"]
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qttranslations"]
path = qttranslations
url = ../qttranslations.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtdoc"]
path = qtdoc
url = ../qtdoc.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtrepotools"]
path = qtrepotools
@@ -56,12 +56,12 @@
[submodule "qtwebkit"]
path = qtwebkit
url = ../qtwebkit.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtwebkit-examples"]
path = qtwebkit-examples
url = ../qtwebkit-examples.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtqa"]
path = qtqa
@@ -71,12 +71,12 @@
[submodule "qtlocation"]
path = qtlocation
url = ../qtlocation.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtsensors"]
path = qtsensors
url = ../qtsensors.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtsystems"]
path = qtsystems
@@ -97,85 +97,85 @@
[submodule "qtconnectivity"]
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtwayland"]
path = qtwayland
url = ../qtwayland.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qt3d"]
path = qt3d
url = ../qt3d.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtimageformats"]
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtquick1"]
path = qtquick1
url = ../qtquick1.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtgraphicaleffects"]
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtquickcontrols"]
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtserialport"]
path = qtserialport
url = ../qtserialport.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtx11extras"]
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtmacextras"]
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtwinextras"]
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtandroidextras"]
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtenginio"]
path = qtenginio
url = ../qtenginio.git
- branch = 1.2
+ branch = dev
initrepo = true
[submodule "qtwebsockets"]
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtwebchannel"]
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtwebengine"]
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.5
+ branch = dev
initrepo = true
[submodule "qtcanvas3d"]
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.5
+ branch = dev
initrepo = true
diff --git a/init-repository b/init-repository
index 46456e9d..e80c7dca 100755
--- a/init-repository
+++ b/init-repository
@@ -334,7 +334,7 @@ sub git_clone_all_submodules
while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
$subbases{$mod} = $base;
} elsif ($2 eq "update") {
- push @subset, '-'.$1 if ($3 eq 'ignore');
+ push @subset, '-'.$1 if ($3 eq 'none');
} elsif ($2 eq "initrepo") {
$subinits{$1} = ($3 eq "yes" or $3 eq "true");
}
diff --git a/qt3d b/qt3d
-Subproject 075c0298d1c75dd2d61849b559edcb357d63868
+Subproject 2e778e83cb12c830dbbf4887d107e1788a0ce60
diff --git a/qtactiveqt b/qtactiveqt
-Subproject ed8d0964b81186824bca5771da224a60a6ccb4e
+Subproject bdb72559195f44546882c59b10bbb07ff9de09a
diff --git a/qtandroidextras b/qtandroidextras
-Subproject ba72dfc82bdfabe84a2240f2542bbfc842cc2b7
+Subproject c3edc76d7c621ddd9015eb9992415be34cf3611
diff --git a/qtbase b/qtbase
-Subproject a02c04a51b34fc780fa680383f2aee3b3f37fa5
+Subproject 51af196ba098e38e3aa654031b237a948962d60
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject ec6569e5604186f6d062c13ed0f2603cdc9004e
+Subproject 5b74d56e8f784676eb5102b5026a8a91997cfac
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 3162d33d98a96e506a4d8dfc6813f1fb0fe44c1
+Subproject d5410c86949c4eee7a270faa62032d068eb6248
diff --git a/qtdeclarative b/qtdeclarative
-Subproject b902f540cda4bb523297a7a5c59520be06f30a1
+Subproject 96a6cfe888d686e3377e219761fe29adcf5f71c
diff --git a/qtdoc b/qtdoc
-Subproject a5b1599699a1844d405e43654b651916502b330
+Subproject 4d231d42d4f2bfc7bdcf54e9348867d53eba46e
diff --git a/qtenginio b/qtenginio
-Subproject efac3cd245e2610924133e304d15bf726f5864f
+Subproject 7302615d35958b1b07293187281cb44d864663d
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 4ee79d3eb4baef9e5b2a3d263f002a24184d0e6
+Subproject 9a5401be1da2fe2ba9227c4008fc086e0fce930
diff --git a/qtimageformats b/qtimageformats
-Subproject c3035a1655090b0f6b194fb8a7586c013ef24f6
+Subproject 532b9452ee6253d1c840843d0a03874ba52d964
diff --git a/qtlocation b/qtlocation
-Subproject ee1deee9a2293a82829efc724ad448aa9a210ae
+Subproject 53ca0aa669ba6c3e13b7e2535dcecfd10662c7f
diff --git a/qtmacextras b/qtmacextras
-Subproject d709388240837cf82cb68ac98c60c1565132a80
+Subproject 486936ac870d88d7d06a2fee3c0d237d3e647e2
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 6187b72c51d0c05955d9d814baf8866b8e70fcf
+Subproject c1dbca5f109b34e8b3a58e241ff40a457e8e2dc
diff --git a/qtqa b/qtqa
-Subproject 2c60d8bb991aecc208cc8501cbd05bf7089fa20
+Subproject 2d09694d233b63989682e668db7410920337e8d
diff --git a/qtquick1 b/qtquick1
-Subproject 15daa5fe1c347b0cad80e46c1aafe1de728c3c0
+Subproject 87b91f933735aa2b7c2295fb8d1cf0692ccf242
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject d9d9dd16da54b6b40c37b8e1e9c2394422835ab
+Subproject 3998f30603581075214f5ed133493a804c9e65f
diff --git a/qtrepotools b/qtrepotools
-Subproject f05180acbd859f63bb8424a7f5f85b398c7fc75
+Subproject a5e67b5aeccc5ef483719bac8690c4983582a53
diff --git a/qtscript b/qtscript
-Subproject f8a48df4fcb2b40c2978c4e446bc6599c942aa3
+Subproject 8cd7557cb45f8732f253a5242c3843c154219d5
diff --git a/qtsensors b/qtsensors
-Subproject c333d25a2a89aeefa936810945fe965cf108679
+Subproject db92906c540a1566d88d025dd24698cb203bea9
diff --git a/qtserialport b/qtserialport
-Subproject 03629b992766fe30ad148ccdf732e0aa1ec0171
+Subproject 90ac0fffa223d8f81cf9a3c6a89cd4ec1de5f53
diff --git a/qtsvg b/qtsvg
-Subproject 7e767afb429910adc0e9a219c5d600b55f6d72d
+Subproject 8c860e474b4fac4e34a2056f1e4532517c20fd6
diff --git a/qtsystems b/qtsystems
-Subproject 44f70d99a2ecd5f3f320650461f1d69142d11bc
+Subproject f0751e67c2dac88948b1210548ef56d1e7c7475
diff --git a/qttools b/qttools
-Subproject ad31b989bff4ef0c616b1beccd4b30933683dd9
+Subproject 1ff544bb1495fa342a9aaf9469b7e89ddb92013
diff --git a/qttranslations b/qttranslations
-Subproject 8eb8dcb1af39cd6129031becc52fa4d6222166e
+Subproject 432176af00c86bb2810520d9b4812616755e877
diff --git a/qtwayland b/qtwayland
-Subproject e4a4a6dd7503f069efbae81c0587f6d8fe3cee9
+Subproject 21a79834a926a420c824cea4c478a33758ebbbf
diff --git a/qtwebchannel b/qtwebchannel
-Subproject ccb40b720a675242b5b93333e5a56d5938086e0
+Subproject c3bcbd1dcd8df8c93924853308d7f2ec95aba82
diff --git a/qtwebengine b/qtwebengine
-Subproject 2776cf6d235c8010ac1b146e12a1c959cb70c9d
+Subproject dac590ce0d0b40af8332209c402639a5e14e4b6
diff --git a/qtwebkit b/qtwebkit
-Subproject a49a02994a5a45cf9966a68621059b0ee9278e0
+Subproject 8b00fdada15a53c7764472435cffe04f22c3522
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 0dc8719647eca19fd0828a86f5e61d21e0b774a
+Subproject 98d82b4cd928bcf9ccc5ad0dc122770aaaf232e
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 0fcfc33963a48dee74eb971decbf89f35c3240f
+Subproject 01eaae540cace513fa73340631dbb3a854c713b
diff --git a/qtwinextras b/qtwinextras
-Subproject e333bc68a1ba83bf881d9f599251ee3b7df3b98
+Subproject b4331a129d2e54b008ad6c471b455ede3c77428
diff --git a/qtx11extras b/qtx11extras
-Subproject e6a813c7869fb3677b15b3907bd6647b5f80bd5
+Subproject 85654ad96a6ae1556292ae31392f296e90e2515
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 5199cce73762771f593f12abbe326f8086142c0
+Subproject 5e8d8f9f07c52546ef5f59eeb687022e7acdc89