diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:21:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-03 05:21:49 (GMT) |
| commit | ce01f19674923cb5144bb56fe76ecbe19865d3bd (patch) | |
| tree | 2235ab6b1b469ca0232ccf621309e3a90d770e2a /src/gui/image/qpnghandler.pri | |
| parent | daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (diff) | |
| parent | 1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (diff) | |
| download | Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.zip Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.tar.gz Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.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/qpnghandler.pri')
| -rw-r--r-- | src/gui/image/qpnghandler.pri | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri new file mode 100644 index 0000000..bedf23f --- /dev/null +++ b/src/gui/image/qpnghandler.pri @@ -0,0 +1,10 @@ +INCLUDEPATH *= $$PWD +HEADERS += $$PWD/qpnghandler_p.h +SOURCES += $$PWD/qpnghandler.cpp +contains(QT_CONFIG, system-png) { + if(unix|win32-g++*): LIBS_PRIVATE += -lpng + else:win32: LIBS += libpng.lib + +} else { + include($$PWD/../../3rdparty/libpng.pri) +} |