diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-07-02 16:30:35 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-02 16:41:08 (GMT) |
| commit | eaf757a5c449e115ced427a0129fb2209fd09e29 (patch) | |
| tree | ba186bbddbf5ac1489b2d7dad6ec230be0a2b152 /src/gui | |
| parent | 3f8a7df075f09c52f0684bbbe9a6214dde8df4ed (diff) | |
| download | Qt-eaf757a5c449e115ced427a0129fb2209fd09e29.zip Qt-eaf757a5c449e115ced427a0129fb2209fd09e29.tar.gz Qt-eaf757a5c449e115ced427a0129fb2209fd09e29.tar.bz2 | |
Consolidate zlib configuration redundancy
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/gui')
| -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) |