Hook qtserialbus into qt5.git
authorAlex Blasche <alexander.blasche@theqtcompany.com>
Wed, 8 Jul 2015 07:58:42 +0000 (09:58 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 3 Sep 2015 17:40:25 +0000 (17:40 +0000)
Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
.gitmodules
qt.pro
qtserialbus [new submodule]

index 804c0e8..30504bb 100644 (file)
        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
diff --git a/qt.pro b/qt.pro
index 2ea0fb0..945a7f9 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -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 (submodule)
index 0000000..1166152
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 11661526113009079c22ed18701c17543c62c25c