summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-11-05 11:48:07 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-05 12:44:52 +0100
commit7e819386283c2ef7f0af1fc9eec6cf7227aa1524 (patch)
tree176a4749011b438081e076fb7d67ef82d9807200 /tools
parent96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b (diff)
Fix "-no-opengl" configuration in Windows
"-no-opengl" didn't clear the default value for "OPENGL_ES_2", which meant "opengles2" got configured in. Task-number: QTBUG-27840 Change-Id: Id7b8e3e268571d820bebfb3700d3961ec96be7fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index d2046413cf..cb7a3f4d6f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -661,6 +661,7 @@ void Configure::parseCmdLine()
// OpenGL Support -------------------------------------------
else if (configCmdLine.at(i) == "-no-opengl") {
dictionary[ "OPENGL" ] = "no";
+ dictionary[ "OPENGL_ES_2" ] = "no";
} else if (configCmdLine.at(i) == "-opengl-es-cm") {
dictionary[ "OPENGL" ] = "yes";
dictionary[ "OPENGL_ES_CM" ] = "yes";