diff options
| author | Jason Barron <jbarron@trolltech.com> | 2010-03-19 14:50:29 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2010-03-19 15:05:32 (GMT) |
| commit | 9842e2f79923d32b6240ce938560a6f3116fa9aa (patch) | |
| tree | e70b54216cdb6568340d8204e0364bc3e88294c0 /mkspecs/common | |
| parent | 681f54aabb89309b66ee4e5b229d7d1fd2e0e78d (diff) | |
| download | Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.zip Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.tar.gz Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.tar.bz2 | |
Change fromSymbianRSgImage() to use the newer version of RSgImage
Symbian have changed the implementation of RSgImage to be more
lightweight and have moved it to a new library. This patch changes Qt's
usage of RSgImage to the new version and fixes some minor code style
issues.
Reviewed-by: Aleksandar Sasha Babic
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 77b42a9..1d00b03 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -70,11 +70,15 @@ QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = -QMAKE_LIBS_OPENVG = -llibOpenVG -lgraphicsresource -lfbscli -lbitgdi -lgdi +QMAKE_LIBS_OPENVG = -llibOpenVG -lfbscli -lbitgdi -lgdi QMAKE_LIBS_COMPAT = QMAKE_LIBS_QT_ENTRY = -llibcrt0.lib QMAKE_LIBS_S60 = -lavkon +exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { + QMAKE_LIBS_OPENVG += -lsgresource +} + contains(QMAKE_HOST.os,Windows) { QMAKE_COPY = copy /y QMAKE_COPY_DIR = xcopy /s /q /y /i |