aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-10-02 15:15:19 +0200
committerLiang Qi <liang.qi@qt.io>2019-10-02 15:55:08 +0000
commitbd3b4ef1706a5bf7a723ddee65adef04edfb2628 (patch)
tree715768aaed9b5d8c2e1a0a5da4c3d5a52db5ce28
parent8e0249218fa2b02d2d7d663cfe2f881ed54b0d11 (diff)
Add qtgamepad and qtscxml to qt5
Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
-rw-r--r--.gitmodules8
m---------qtgamepad0
m---------qtscxml0
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 4c618445..10b9bd3d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -271,14 +271,14 @@
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = dev
- status = ignore
+ branch = wip/cmake
+ status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
diff --git a/qtgamepad b/qtgamepad
-Subproject 2ff613b5971d687d8d92e6baad3466ee2af5c43
+Subproject 28113e0f22fb62d02abf8b75910f7357be7bf1f
diff --git a/qtscxml b/qtscxml
-Subproject f149bb9d9afbe7a3d81741e95a121b78be25bbd
+Subproject 5fe75751ed90354eb0968f528974592003c6546