aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-11-14 18:24:29 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-15 13:02:52 +0000
commiteabc1ed5bd46a7882c5b98a19716e3b9aef694fa (patch)
treef547ce1d5ccc42e00969de467769f96fd036f4d2
parent3903c2a72de7d6560039632324939ed051ab0533 (diff)
Add a few more ported repos to qt5.git wip/cmake
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--.gitmodules6
m---------qtquickcontrols20
m---------qtremoteobjects0
m---------qtwinextras0
4 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index a0f11be2..0507f678 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -189,7 +189,7 @@
path = qtwinextras
url = ../qtwinextras.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
@@ -237,7 +237,7 @@
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = dev
- status = ignore
+ status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
@@ -298,7 +298,7 @@
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 247dad297cb7f8d5af42434c67d24ffcc7bae01
+Subproject 6f617349cf865ca3a7befc0dd472b7c2510fc43
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject d9b4c020eb158d7fceb439ff66f7ce5db5a9df5
+Subproject a959d167858aa4708b82e7b61efc9db7243c184
diff --git a/qtwinextras b/qtwinextras
-Subproject c496ca49dc0a01edcb0576818dab705ff5e02fe
+Subproject 816942521342e9a8c4c279fb6c759e65c8ff56b