diff options
| -rw-r--r-- | config.profiles/symbian/bld.inf | 9 | ||||
| -rw-r--r-- | src/s60installs/qt.iby | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf index bfddedcaa8..01c2320e90 100644 --- a/config.profiles/symbian/bld.inf +++ b/config.profiles/symbian/bld.inf @@ -119,5 +119,12 @@ translations/qt_zh_TW.ts /epoc32/include/platform/qt/translations/ PRJ_EXTENSIONS START EXTENSION qt/qtconfig OPTION QT_ROOT .. -OPTION OPTIONS -opensource -confirm-license -openvg -opengl es2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2 -debug -debug-and-release + +#ifdef VSW_GSW_HAVE_OPENGL_ES2 +# define QT_OPENGL_ES_CONFIG -opengl es2 +#else +# define QT_OPENGL_ES_CONFIG +#endif + +OPTION OPTIONS -opensource -confirm-license -openvg QT_OPENGL_ES_CONFIG -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2 -debug -debug-and-release END diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index 4f2a3b4364..0bd6114d00 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -19,7 +19,10 @@ file=ABI_DIR\BUILD_DIR\phonon.dll SHARED_LIB_DIR\phonon.dll file=ABI_DIR\BUILD_DIR\QtMultimedia.dll SHARED_LIB_DIR\QtMultimedia.dll file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll SHARED_LIB_DIR\QtXmlPatterns.dll file=ABI_DIR\BUILD_DIR\QtDeclarative.dll SHARED_LIB_DIR\QtDeclarative.dll + +#ifdef VSW_GSW_HAVE_OPENGL_ES2 file=ABI_DIR\BUILD_DIR\QtOpenGL.dll SHARED_LIB_DIR\QtOpenGL.dll +#endif // imageformats file=ABI_DIR\BUILD_DIR\qgif.dll SHARED_LIB_DIR\qgif.dll |