diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 20:58:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 20:58:55 (GMT) |
| commit | 1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (patch) | |
| tree | a019bc5a4fba7de4980c8f0cb5bee3e7a42f57f4 /src/gui/painting | |
| parent | 0eee17b5d789c2314f582e363e377809ef6dea7c (diff) | |
| parent | eaf757a5c449e115ced427a0129fb2209fd09e29 (diff) | |
| download | Qt-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/painting')
| -rw-r--r-- | src/gui/painting/painting.pri | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index a5cfb84..07aabc9 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -402,11 +402,4 @@ neon:*-g++* { QMAKE_EXTRA_COMPILERS += neon_compiler } -contains(QT_CONFIG, zlib) { - INCLUDEPATH += ../3rdparty/zlib -} else:!contains(QT_CONFIG, no-zlib) { - symbian:LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz - else:LIBS += zdll.lib -} - +include($$PWD/../../3rdparty/zlib_dependency.pri) |