summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-02-08 17:45:40 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-09 07:54:59 +0100
commit63d681ee575c28c972f709af4a1c2b35e03064d8 (patch)
treeaed21e2ba01c3b0f9c05aa2f15721abffb7b1a31
parentc4ebe393de42d16314b27ae024087fa942436474 (diff)
Add the QtQuick1 module.
Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro9
m---------qtquick10
4 files changed, 11 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 205c2a41..fa79f1d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,3 +82,6 @@
[submodule "qtimageformats"]
path = qtimageformats
url = git://gitorious.org/qt/qtimageformats.git
+[submodule "qtquick1"]
+ path = qtquick1
+ url = git://gitorious.org/qt/qtquick1.git
diff --git a/init-repository b/init-repository
index cc4bf02c..ab71c1f1 100755
--- a/init-repository
+++ b/init-repository
@@ -236,6 +236,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtphonon
qtpim
qtqa
+ qtquick1
qtrepotools
qtscript
qtsensors
diff --git a/qt.pro b/qt.pro
index e59b30ce..757da5a3 100644
--- a/qt.pro
+++ b/qt.pro
@@ -29,7 +29,7 @@ module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtjsbac
module_qtwebkit.file = qtwebkit.pri
module_qtwebkit.makefile = Makefile.qtwebkit
-module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative
+module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_qtquick1
# The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does.
module_qtwebkit_target.target = module-qtwebkit
module_qtwebkit_target.commands =
@@ -42,7 +42,7 @@ module_qtwebkit_examples_and_demos.depends = module_qtwebkit
module_qttools.subdir = $$IN_PWD/qttools
module_qttools.target = module-qttools
-module_qttools.depends = module_qtbase module_qtscript module_qtdeclarative
+module_qttools.depends = module_qtbase module_qtscript module_qtquick1
win32:module_qttools.depends += module_qtactiveqt
module_qttranslations.subdir = $$IN_PWD/qttranslations
@@ -115,6 +115,10 @@ module_qtimageformats.subdir = $$IN_PWD/qtimageformats
module_qtimageformats.target = module-qtimageformats
module_qtimageformats.depends = module_qtbase
+module_qtquick1.subdir = $$IN_PWD/qtquick1
+module_qtquick1.target = module-qtquick1
+module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
+
# only qtbase is required to exist. The others may not - but it is the
# users responsibility to ensure that all needed dependencies exist, or
# it may not build.
@@ -151,6 +155,7 @@ exists(qtjsondb/qtjsondb.pro) {
}
exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
+exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
diff --git a/qtquick1 b/qtquick1
new file mode 160000
+Subproject b05039d5efcaec69d01d3737ccb5f0199765632