Add qtimageformats module to Qt5. master_201201311526
authorToby Tomkins <toby.tomkins@nokia.com>
Tue, 31 Jan 2012 00:19:39 +0000 (10:19 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 31 Jan 2012 05:15:57 +0000 (06:15 +0100)
Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
.gitmodules
init-repository
qt.pro
qtimageformats [new submodule]

index 6e10557..205c2a4 100644 (file)
@@ -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
index 644d138..cc4bf02 100755 (executable)
@@ -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 86be51a..e59b30c 100644 (file)
--- 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 (submodule)
index 0000000..c64ae4f
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit c64ae4f1615f0fe9322ffcb09e50e360068fd11a