aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-09-19 16:00:10 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-09-19 14:42:13 +0000
commit5c1656826bce042866d08c4e86a62335dec07a24 (patch)
tree5884e843f8d855e9b6f9a2752180f50e41b7407a
parent5560b7eced65a83288263ddd06d8d9e2cb6805df (diff)
Add qtserialport to qt5
The module has received its initial port Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Qt CMake Build Bot
-rw-r--r--.gitmodules4
m---------qtserialport0
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index e103e853..eaecbd44 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -169,8 +169,8 @@
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
diff --git a/qtserialport b/qtserialport
-Subproject 0da18e91f44ac916540450a33d5c64b59d34793
+Subproject 09392f99b62dd6c7d4d3b848b18719af60c315c