diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-15 13:27:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-15 13:27:43 (GMT) |
| commit | 45c3a2e5e5ff6fd79c42345d46a1057bc530ab93 (patch) | |
| tree | 03d3b873d8e8e1eec52af84e52c14114528408f7 /mkspecs | |
| parent | 4bcd23c4a9d5a596d0c90dbb1569385f30fadbac (diff) | |
| parent | dc65a73fa38d1f85b75e9d4ad71ebdbc1c7d85f5 (diff) | |
| download | Qt-45c3a2e5e5ff6fd79c42345d46a1057bc530ab93.zip Qt-45c3a2e5e5ff6fd79c42345d46a1057bc530ab93.tar.gz Qt-45c3a2e5e5ff6fd79c42345d46a1057bc530ab93.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:
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
Do not use SetSurfaceTransparency() on raster.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index f955e3c..8e04099 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -84,7 +84,7 @@ 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 +QMAKE_LIBS_S60 = -lavkon -leikcoctl -lgfxtrans exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) { QMAKE_LIBS_OPENVG += -lsgresource |