summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-11-02 14:59:24 +1000
committerKeith Isdale <keith.isdale@nokia.com>2009-11-02 14:59:24 +1000
commit504ac5668c7308dc67233ed8589eeadcd23e7cdd (patch)
tree04259889f1c7d57f7002b537834cdf396a9ea6b2 /tools
parent55dcc5551e338ba16c0db8c7d6593554d3d019b8 (diff)
downloadqt4-tools-504ac5668c7308dc67233ed8589eeadcd23e7cdd.tar.gz
Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CE
Enable building egl/qegl_wince.cpp when a wince* mkspec is used Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used Task-number: QTBUG-5073 Reviewed-by: Trond Kjernåsen
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6d46c18854..dd3823be5a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2438,14 +2438,17 @@ void Configure::generateOutputVars()
if ( dictionary["OPENGL_ES_CM"] == "yes" ) {
qtConfig += "opengles1";
+ qtConfig += "egl";
}
if ( dictionary["OPENGL_ES_2"] == "yes" ) {
qtConfig += "opengles2";
+ qtConfig += "egl";
}
if ( dictionary["OPENGL_ES_CL"] == "yes" ) {
qtConfig += "opengles1cl";
+ qtConfig += "egl";
}
if ( dictionary["OPENVG"] == "yes" ) {