aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
-rw-r--r--qt.pro5
m---------qtimageformats0
4 files changed, 9 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 6e105573..205c2a41 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,3 +79,6 @@
[submodule "qtjsbackend"]
path = qtjsbackend
url = git://gitorious.org/qt/qtjsbackend.git
+[submodule "qtimageformats"]
+ path = qtimageformats
+ url = git://gitorious.org/qt/qtimageformats.git
diff --git a/init-repository b/init-repository
index 644d1383..cc4bf02c 100755
--- a/init-repository
+++ b/init-repository
@@ -228,6 +228,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtdoc
qtdocgallery
qtfeedback
+ qtimageformats
qtjsondb
qtjsbackend
qtlocation
diff --git a/qt.pro b/qt.pro
index 86be51ad..e59b30ce 100644
--- a/qt.pro
+++ b/qt.pro
@@ -111,6 +111,10 @@ module_qtjsondb.subdir = $$IN_PWD/qtjsondb
module_qtjsondb.target = module-qtjsondb
module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns
+module_qtimageformats.subdir = $$IN_PWD/qtimageformats
+module_qtimageformats.target = module-qtimageformats
+module_qtimageformats.depends = module_qtbase
+
# 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.
@@ -146,6 +150,7 @@ exists(qtjsondb/qtjsondb.pro) {
module_qtsystems.depends += module_qtjsondb
}
exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
+exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
diff --git a/qtimageformats b/qtimageformats
new file mode 160000
+Subproject c64ae4f1615f0fe9322ffcb09e50e360068fd11