summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-26 15:57:48 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-26 16:02:55 (GMT)
commit0e7a43dba248030c673be5deab8ca70d14c0798f (patch)
tree07672db90a8d0109bd6b0d4343792eeb36b9e782 /tools/configure/configureapp.cpp
parent345e299c512094b50868c9ee71cbba83db593444 (diff)
downloadQt-0e7a43dba248030c673be5deab8ca70d14c0798f.zip
Qt-0e7a43dba248030c673be5deab8ca70d14c0798f.tar.gz
Qt-0e7a43dba248030c673be5deab8ca70d14c0798f.tar.bz2
Define QT_NO_EGL in configure.exe
This is the "proper" fix for the windows build failure introduced by 75bb84ac. a44026a3 should be reverted once configure.exe is rebuilt to incorperate this fix. Reviewed-By: Marius Storm-Olsen
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r--tools/configure/configureapp.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0b14cba..dfd1196 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3041,6 +3041,10 @@ void Configure::generateConfigfiles()
if(dictionary["S60"] == "no") qconfigList += "QT_NO_S60";
if(dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES";
+ if(dictionary["OPENGL_ES_CM"] == "no" &&
+ dictionary["OPENGL_ES_2"] == "no" &&
+ dictionary["OPENVG"] == "no") qconfigList += "QT_NO_EGL";
+
if(dictionary["OPENGL_ES_CM"] == "yes" ||
dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES";