summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-04 09:30:01 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-09-03 22:45:29 +0000
commite734941df8b37795eca7ad00044ed0c7d43eefe4 (patch)
tree8a6bcca4430e59cfe291a5fe1d9cda61e55aa71f
parentc5cb9d2d896a0b24064e3263eeb1e5cc26e7528f (diff)
Add QtQuickControls2 as submodulev5.6.0-alpha1
Change-Id: I435fb765b48a978763384226e399b33448a40502 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-rw-r--r--.gitmodules5
-rw-r--r--qt.pro1
m---------qtquickcontrols20
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 30504bb0..b8fbe40d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -185,3 +185,8 @@
url = ../qtwebview.git
branch = 5.6
initrepo = true
+[submodule "qtquickcontrols2"]
+ path = qtquickcontrols2
+ url = ../qtquickcontrols2.git
+ branch = 5.6
+ initrepo = true
diff --git a/qt.pro b/qt.pro
index 945a7f9e..b55805c9 100644
--- a/qt.pro
+++ b/qt.pro
@@ -66,6 +66,7 @@ addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
+addModule(qtquickcontrols2, qtquickcontrols)
addModule(qtmultimedia, qtbase, qtdeclarative)
addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
diff --git a/qtquickcontrols2 b/qtquickcontrols2
new file mode 160000
+Subproject 0addfd5d586c7850c1e470f24c6364e6305dfa0