Skip to content

Commit 327fa27

Browse files
Pasi PentikainenQt by Nokia
authored andcommitted
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 <[email protected]> Reviewed-by: Jani Hautakangas <[email protected]>
1 parent febdc08 commit 327fa27

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

config.profiles/symbian/bld.inf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,12 @@ translations/qt_zh_TW.ts /epoc32/include/platform/qt/translations/
119119
PRJ_EXTENSIONS
120120
START EXTENSION qt/qtconfig
121121
OPTION QT_ROOT ..
122-
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
122+
123+
#ifdef VSW_GSW_HAVE_OPENGL_ES2
124+
# define QT_OPENGL_ES_CONFIG -opengl es2
125+
#else
126+
# define QT_OPENGL_ES_CONFIG
127+
#endif
128+
129+
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
123130
END

src/s60installs/qt.iby

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ file=ABI_DIR\BUILD_DIR\phonon.dll SHARED_LIB_DIR\phonon.dll
1919
file=ABI_DIR\BUILD_DIR\QtMultimedia.dll SHARED_LIB_DIR\QtMultimedia.dll
2020
file=ABI_DIR\BUILD_DIR\QtXmlPatterns.dll SHARED_LIB_DIR\QtXmlPatterns.dll
2121
file=ABI_DIR\BUILD_DIR\QtDeclarative.dll SHARED_LIB_DIR\QtDeclarative.dll
22+
23+
#ifdef VSW_GSW_HAVE_OPENGL_ES2
2224
file=ABI_DIR\BUILD_DIR\QtOpenGL.dll SHARED_LIB_DIR\QtOpenGL.dll
25+
#endif
2326

2427
// imageformats
2528
file=ABI_DIR\BUILD_DIR\qgif.dll SHARED_LIB_DIR\qgif.dll

0 commit comments

Comments
 (0)