aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-24 17:11:35 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-24 15:49:17 +0000
commitbf87526ff08f273cb89b0765e174258dcdab7e67 (patch)
tree573d357810eeb7875b154bec3afc2c759b10ce0d
parentedf685187505b42290f2ad6d9eb4c4b1107b684c (diff)
Add QtConnectivity
Now that the cmake port landed Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
-rw-r--r--.gitmodules4
m---------qtconnectivity0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 9167958c..f004618a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -123,8 +123,8 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
diff --git a/qtconnectivity b/qtconnectivity
-Subproject b58c470962aa6831f53d088afd523c1b1530fbc
+Subproject b50a574c8e2bf77c17fea3bfd490deb9b5fccac