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/corelib | |
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/corelib')
-rw-r--r-- | src/corelib/tools/tools.pri | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index e579dd5..d81ab04 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -89,27 +89,8 @@ else:unix:SOURCES += tools/qelapsedtimer_unix.cpp else:win32:SOURCES += tools/qelapsedtimer_win.cpp else:SOURCES += tools/qelapsedtimer_generic.cpp -#zlib support -contains(QT_CONFIG, zlib) { - wince*: DEFINES += NO_ERRNO_H - INCLUDEPATH += ../3rdparty/zlib - SOURCES+= \ - ../3rdparty/zlib/adler32.c \ - ../3rdparty/zlib/compress.c \ - ../3rdparty/zlib/crc32.c \ - ../3rdparty/zlib/deflate.c \ - ../3rdparty/zlib/gzio.c \ - ../3rdparty/zlib/inffast.c \ - ../3rdparty/zlib/inflate.c \ - ../3rdparty/zlib/inftrees.c \ - ../3rdparty/zlib/trees.c \ - ../3rdparty/zlib/uncompr.c \ - ../3rdparty/zlib/zutil.c -} else:!contains(QT_CONFIG, no-zlib) { - symbian:LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz - else:LIBS += zdll.lib -} +contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty/zlib.pri) +else:include($$PWD/../../3rdparty/zlib_dependency.pri) DEFINES += HB_EXPORT=Q_CORE_EXPORT INCLUDEPATH += ../3rdparty/harfbuzz/src |