Fix "-no-opengl" configuration in Windows
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Mon, 5 Nov 2012 09:48:07 +0000 (11:48 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 5 Nov 2012 11:44:52 +0000 (12:44 +0100)
"-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>
tools/configure/configureapp.cpp

index d204641..cb7a3f4 100644 (file)
@@ -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";