diff options
| -rw-r--r-- | src/svg/svg.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qsvggenerator/qsvggenerator.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qsvgrenderer/qsvgrenderer.pro | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index bfae661..d4f818a 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -46,11 +46,8 @@ wince*: { 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) diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro index 2c403f5..c7a05dc 100644 --- a/tests/auto/qsvggenerator/qsvggenerator.pro +++ b/tests/auto/qsvggenerator/qsvggenerator.pro @@ -4,7 +4,7 @@ QT += svg xml testlib widgets gui-private SOURCES += tst_qsvggenerator.cpp -wince*|symbian { +wince* { addFiles.files = referenceSvgs addFiles.path = . DEPLOYMENT += addFiles @@ -12,7 +12,7 @@ wince*|symbian { wince* { DEFINES += SRCDIR=\\\"\\\" -} else:!symbian { +} else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro index 94586f5..4b9e168 100644 --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro @@ -5,7 +5,7 @@ QT += svg testlib widgets gui-private SOURCES += tst_qsvgrenderer.cpp RESOURCES += resources.qrc -wince*|symbian { +wince* { addFiles.files = *.svg *.svgz addFiles.path = . @@ -15,7 +15,5 @@ wince*|symbian { } } -!symbian: { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} +DEFINES += SRCDIR=\\\"$$PWD/\\\" DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |