summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qgifhandler.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-02 20:58:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-02 20:58:55 (GMT)
commit1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (patch)
treea019bc5a4fba7de4980c8f0cb5bee3e7a42f57f4 /src/gui/image/qgifhandler.pri
parent0eee17b5d789c2314f582e363e377809ef6dea7c (diff)
parenteaf757a5c449e115ced427a0129fb2209fd09e29 (diff)
downloadQt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.zip
Qt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.tar.gz
Qt-1358c4b53cf4cec83ea6d9b0f886b99f76c4847e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
Diffstat (limited to 'src/gui/image/qgifhandler.pri')
-rw-r--r--src/gui/image/qgifhandler.pri4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri
new file mode 100644
index 0000000..003476a
--- /dev/null
+++ b/src/gui/image/qgifhandler.pri
@@ -0,0 +1,4 @@
+# common to plugin and built-in forms
+INCLUDEPATH *= $$PWD
+HEADERS += $$PWD/qgifhandler.h
+SOURCES += $$PWD/qgifhandler.cpp