diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-04 09:31:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-04 09:31:15 (GMT) |
| commit | 76aad35bd9f699c966295738095d245a5e7a6457 (patch) | |
| tree | cd451d1b5b40b47b21fd78bab940ce538736e5d4 /src/svg/svg.pro | |
| parent | daeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (diff) | |
| parent | 4cdd831191a22604486fa895c57532f319a56b96 (diff) | |
| download | Qt-76aad35bd9f699c966295738095d245a5e7a6457.zip Qt-76aad35bd9f699c966295738095d245a5e7a6457.tar.gz Qt-76aad35bd9f699c966295738095d245a5e7a6457.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:
make image handler includes private
fix symbian build
doc improvements
rebuild configure
s/INCPATH/INCLUDEPATH/
Fix Windows build
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/svg/svg.pro')
| -rw-r--r-- | src/svg/svg.pro | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index de4bba6..7b5251a 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -42,11 +42,4 @@ INCLUDEPATH += ../3rdparty/harfbuzz/src symbian:TARGET.UID3=0x2001B2E2 -#zlib support -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(../3rdparty/zlib_dependency.pri) |