diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-05 13:23:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-05 13:23:02 (GMT) |
| commit | 059a2ff8d621d9c67e3a97969d34edb6e173a4f3 (patch) | |
| tree | c8a25b0077d37b30dec377dc552a60799c838a2e /mkspecs | |
| parent | 8dde027451601ff82793a0f4f146ec0ae5932893 (diff) | |
| parent | 270c644937fb402332671208435ac600b280e5b8 (diff) | |
| download | Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.zip Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.tar.gz Qt-059a2ff8d621d9c67e3a97969d34edb6e173a4f3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compile errors on S60 3.2
Fix to QGLWidget rendering with VG graphics system
Diffstat (limited to 'mkspecs')
| -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 e30347b..7910873 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -84,7 +84,11 @@ QMAKE_LIBS_OPENGL_ES2_QT = $$QMAKE_LIBS_OPENGL_ES2 $$QMAKE_LIBS_CFBSBITMAP -lcon QMAKE_LIBS_OPENVG = $$QMAKE_LIBS_CFBSBITMAP -llibOpenVG QMAKE_LIBS_THREAD = -llibpthread QMAKE_LIBS_COMPAT = -QMAKE_LIBS_S60 = -lavkon -leikcoctl -lgfxtrans +QMAKE_LIBS_S60 = -lavkon -leikcoctl + +exists($${EPOCROOT}epoc32/include/platform/mw/akntranseffect.h) { + QMAKE_LIBS_S60 += -lgfxtrans +} exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { QMAKE_LIBS_OPENVG += -lsgresource |