diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-07-08 09:58:42 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-09-03 17:40:25 +0000 |
commit | c5cb9d2d896a0b24064e3263eeb1e5cc26e7528f (patch) | |
tree | a19eaae294f5776b14cb5b3c97f46da9cd0e6b2c | |
parent | 4c520caa6919b115745710fa676ba995f4843a6f (diff) |
Hook qtserialbus into qt5.git
Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r-- | .gitmodules | 4 | ||||
-rw-r--r-- | qt.pro | 1 | ||||
m--------- | qtserialbus | 0 |
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 804c0e84..30504bb0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -126,6 +126,10 @@ url = ../qtquickcontrols.git branch = 5.6 initrepo = true +[submodule "qtserialbus"] + path = qtserialbus + url = ../qtserialbus.git + branch = 5.6 [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git @@ -88,6 +88,7 @@ addModule(qtscript, qtbase, qttools) addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) +addModule(qtserialbus, qtbase) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) diff --git a/qtserialbus b/qtserialbus new file mode 160000 +Subproject 11661526113009079c22ed18701c17543c62c25 |