summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-03-02 12:53:33 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-03 00:53:12 +0100
commitd3a8758a8c4b57023900414b0f2f76103ccc29d9 (patch)
tree2a874b9a93d4e88262138217ba66b021c96f27cd
parentbc8806c07b28499d11677fa36710a3eee5791763 (diff)
Added new module, qtgraphicaleffects.
Not yet enabled by default. Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro7
m---------qtgraphicaleffects0
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index fa79f1d8..e7d5d1eb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,6 @@
[submodule "qtquick1"]
path = qtquick1
url = git://gitorious.org/qt/qtquick1.git
+[submodule "qtgraphicaleffects"]
+ path = qtgraphicaleffects
+ url = git://gitorious.org/qt/qtgraphicaleffects.git
diff --git a/init-repository b/init-repository
index ab71c1f1..4c4d7b03 100755
--- a/init-repository
+++ b/init-repository
@@ -228,6 +228,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtdoc
qtdocgallery
qtfeedback
+ qtgraphicaleffects
qtimageformats
qtjsondb
qtjsbackend
diff --git a/qt.pro b/qt.pro
index 30d7ab82..9803b338 100644
--- a/qt.pro
+++ b/qt.pro
@@ -119,6 +119,12 @@ module_qtquick1.subdir = $$IN_PWD/qtquick1
module_qtquick1.target = module-qtquick1
module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
+module_qtgraphicaleffects.subdir = $$IN_PWD/qtgraphicaleffects
+module_qtgraphicaleffects.target = module-qtgraphicaleffects
+module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative module_qtsvg module_qtxmlpatterns
+# not yet enabled by default
+module_qtgraphicaleffects.CONFIG = no_default_target no_default_install
+
# 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.
@@ -156,6 +162,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(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
new file mode 160000
+Subproject cca4a7fd0319b0bcc49af5f3f1b79ea413893b6