summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-09-07 11:00:01 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-09-24 05:22:42 +0000
commitd7f477d1cd1fbad5fb0609f340af278cab8c6bae (patch)
tree85561637f2b91d339a1741aeea96a6a6e3249711
parentc42dd3462b18b3f85c32d1dd207922183e706fe4 (diff)
Add qtpurchasing as non-default module
For 5.6 this is a tech preview, it will be added properly in 5.7. Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-rw-r--r--.gitmodules4
-rw-r--r--qt.pro1
m---------qtpurchasing0
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index b8fbe40d..211c331c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -190,3 +190,7 @@
url = ../qtquickcontrols2.git
branch = 5.6
initrepo = true
+[submodule "qtpurchasing"]
+ path = qtpurchasing
+ url = ../qtpurchasing.git
+ branch = 5.6
diff --git a/qt.pro b/qt.pro
index b55805c9..a9ade877 100644
--- a/qt.pro
+++ b/qt.pro
@@ -93,6 +93,7 @@ addModule(qtserialbus, qtbase)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
+addModule(qtpurchasing, qtbase, qtdeclarative)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)
diff --git a/qtpurchasing b/qtpurchasing
new file mode 160000
+Subproject 951d75d744ab66665b41d533ce3d38df07c0400