aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-06-18 10:36:01 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-18 10:36:33 +0200
commit452e0d94d40bba15a56293a0a0f7d093dececda9 (patch)
treeeef4238b88cd5b357c4e5fe5e1e559d15df49304
parentb611da5b35425f6edd17a1190f5002f8f69337ce (diff)
Update submodules on '5.12' in qt5
Ignore qtvirtualkeyboard temporarily. Task-number: QTBUG-76371 Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7 Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--.gitmodules2
m---------qtbase0
m---------qtdeclarative0
m---------qtdoc0
m---------qtmultimedia0
m---------qtqa0
m---------qtrepotools0
m---------qtserialbus0
m---------qttools0
m---------qttranslations0
m---------qtwebengine0
11 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 7657f30f..9884474c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -264,7 +264,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.12
- status = addon
+ status = ignore
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
diff --git a/qtbase b/qtbase
-Subproject 224a60989ed95e8b91ac88a12666af6e5a66e61
+Subproject 067664531853a1e857c777c1cc56fc64b272e02
diff --git a/qtdeclarative b/qtdeclarative
-Subproject b1e9bc580adc1e7b3b1398f392016880dc5201b
+Subproject 1eb3a6febec8fa8bb616a3765c1a899210135f3
diff --git a/qtdoc b/qtdoc
-Subproject faf46dfbcbfc058b3bd891f0b3ae45401b58e7d
+Subproject 9dc3bd8fea81a8e1bba751215c7ff0ebacdd1b9
diff --git a/qtmultimedia b/qtmultimedia
-Subproject edbc8cb39130410801bffefb59d5c3a3c383e84
+Subproject 8933a59719a5f0c33d47f202d220a566765ec6d
diff --git a/qtqa b/qtqa
-Subproject 305f198ccf65a28cfd8d2e563b41510c8365bcf
+Subproject 76b891a51af47b2b7b6d7a1cf6deb03eab2f069
diff --git a/qtrepotools b/qtrepotools
-Subproject f6f2b04bd1dbeae3bdaaf683357087296ab3739
+Subproject 61191bf37d3e03f190943725c2c99d9c5fcb3fd
diff --git a/qtserialbus b/qtserialbus
-Subproject 673495d2eb1fe9cdf701351d75c2203c80ab6ba
+Subproject a49336c78a0b610b2dff25ecc1f292bdeefbfda
diff --git a/qttools b/qttools
-Subproject c7f96f5301c2e60d1c5ef1e945e70e921afc71c
+Subproject 0d2a9408ed2a5c664330c5742c9afb610a6c734
diff --git a/qttranslations b/qttranslations
-Subproject ebd5ad86ac35fc27e58489d1389abb6cacfb2b1
+Subproject 6a580f7b92cca74c824fca66c136df84725ecc6
diff --git a/qtwebengine b/qtwebengine
-Subproject 2c86c348d7a94f27d1e9e7a71c2435565cbe6fb
+Subproject af1c0087e51b6e2ad905259bb7a1d50101735d2