diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 15:38:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-01 15:38:45 (GMT) |
| commit | 296f64a839a6af458a98d36da4836cab1d5cbb8e (patch) | |
| tree | caca4423ef4e938d5b06944eeb0752b06bba6b10 /mkspecs | |
| parent | 84f4a8590471928fcd5e98fb424a9b6b89603ef1 (diff) | |
| parent | 20d1bf0db865c93424c55838833b7d4d2551b758 (diff) | |
| download | Qt-296f64a839a6af458a98d36da4836cab1d5cbb8e.zip Qt-296f64a839a6af458a98d36da4836cab1d5cbb8e.tar.gz Qt-296f64a839a6af458a98d36da4836cab1d5cbb8e.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:
QS60Style: provide more standard icons
Update QtOpenGL section in Symbian platform notes.
The qmlshadersplugin deployment must be scoped same as its building
Do not try to open VKB if it is already open in Symbian
Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 0288ada..e30347b 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -88,6 +88,9 @@ QMAKE_LIBS_S60 = -lavkon -leikcoctl -lgfxtrans exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { QMAKE_LIBS_OPENVG += -lsgresource + QMAKE_LIBS_OPENGL_QT += -lsgresource + QMAKE_LIBS_OPENGL_ES1_QT += -lsgresource + QMAKE_LIBS_OPENGL_ES2_QT += -lsgresource } contains(QMAKE_HOST.os,Windows) { |