aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-10-09 10:11:34 +0200
committerLiang Qi <liang.qi@qt.io>2019-10-09 08:27:00 +0000
commit6df365e0b255750d4d1886110a137030ec3c6e15 (patch)
tree47ca3568f07e5af707043657cdc2b975cff669c2
parentbeb62ece41827ee8a554dc144f24f37296ebe21a (diff)
Add qtserialbus to qt5
Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CMake Build Bot
-rw-r--r--.gitmodules4
m---------qtserialbus0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 10b9bd3d..9167958c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -163,8 +163,8 @@
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
diff --git a/qtserialbus b/qtserialbus
-Subproject 8dd3e45961b7098bc50649cfb8191eb3cbdf19e
+Subproject e31f61763d347de933c60d808f941d17eaf7f4e