diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-01-31 10:19:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 06:15:57 +0100 |
| commit | 136762ee098f9eefb4736de4745313d06f07fafc (patch) | |
| tree | e95ca7cafbf0beea3725343f2fc95f1f4088081b | |
| parent | 93458fe8562b54bdb3fb1b00e75158c60221df76 (diff) | |
Add qtimageformats module to Qt5.
Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 5 | ||||
| m--------- | qtimageformats | 0 |
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 @@ -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 |