summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-11-25 10:54:17 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-25 16:40:40 +0000
commit3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 (patch)
treedb14175ca62c26b26e8367ecaef5d41ce2b24769
parenta72db33bfc9acc20de9bce0c2c5a24c59d90fa04 (diff)
Update qt5.git
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--.gitmodules2
m---------qtbase0
m---------qtdeclarative0
m---------qtquickcontrols20
m---------qtserialbus0
5 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 0507f678..a161c519 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -236,7 +236,7 @@
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = dev
+ branch = wip/cmake
status = essential
[submodule "qtpurchasing"]
depends = qtbase
diff --git a/qtbase b/qtbase
-Subproject 7a6c6da2ebbfef33f7284ce5c96aa0c3acabc6b
+Subproject 1c655fb0fc08e89ab5efb23889266b710334f1a
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 387f360b3b2634094889478f2b258e65a70b9aa
+Subproject f500062e165975e112ea644da1d6a3d4c413be2
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 6f617349cf865ca3a7befc0dd472b7c2510fc43
+Subproject 2bd4f5cd587e258227c69b3124757d7b8e019c9
diff --git a/qtserialbus b/qtserialbus
-Subproject e31f61763d347de933c60d808f941d17eaf7f4e
+Subproject a3e6b5b9617d2f87e00158ae4b15e8db3e9c656