diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
| commit | d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0 (patch) | |
| tree | f01009393fe34a9a7bd42785b4211ce67e2088a2 /src/svg/svg.pro | |
| parent | f88807e62f48c0e4f714a40d306e1ed0caaa932a (diff) | |
| parent | 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c (diff) | |
| download | qtsvg-d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
Diffstat (limited to 'src/svg/svg.pro')
| -rw-r--r-- | src/svg/svg.pro | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index bfae661..8ee9061 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -1,6 +1,6 @@ TARGET = QtSvg QT = core-private gui-private -!contains(QT_CONFIG, no-widgets): QT += widgets-private +qtHaveModule(widgets): QT += widgets-private DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 @@ -44,14 +44,9 @@ wince*: { qsvgfunctions_wince.h } -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -symbian:TARGET.UID3=0x2001B2E2 - contains(QT_CONFIG, system-zlib) { - symbian: LIBS_PRIVATE += -llibz - else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + if(unix|win32-g++*): LIBS_PRIVATE += -lz else: LIBS += zdll.lib } else { - include(../3rdparty/zlib.pri) + INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib } |