summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-15 23:27:43 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-15 23:27:43 +1000
commit45c3a2e5e5ff6fd79c42345d46a1057bc530ab93 (patch)
tree03d3b873d8e8e1eec52af84e52c14114528408f7 /mkspecs
parent4bcd23c4a9d5a596d0c90dbb1569385f30fadbac (diff)
parentdc65a73fa38d1f85b75e9d4ad71ebdbc1c7d85f5 (diff)
downloadqt4-tools-45c3a2e5e5ff6fd79c42345d46a1057bc530ab93.tar.gz
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.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index f955e3c743..8e04099df9 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