diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-03-21 16:42:17 +0200 |
|---|---|---|
| committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-03-23 13:49:26 +0100 |
| commit | 9db4b7046098883c65f5440c9b6994551fd24a30 (patch) | |
| tree | d04d509bb123982986e6b3e5554e2de9042e1f87 | |
| parent | 8b709c10a5aacff829d063d7e20f447844771e93 (diff) | |
| download | qt4-tools-9db4b7046098883c65f5440c9b6994551fd24a30.tar.gz | |
Symbian: drop OpenGL ES in non-supported hardware
When hardware configuration has no OpenGL ES 2 support indicated, leave
OpenGL ES out of Qt compilation alltogether.
Task-number: ou1cimx1#987609
Change-Id: If43a8de059596fbdb52c97535436c441760c97ab
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
(cherry picked from commit 327fa27f7d06d6328df2716eb7d78916fd0938cf)
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
| -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 82c4e3c479..d3d9dc9785 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 |