summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-12 11:21:56 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-12 11:22:16 (GMT)
commitf62e846c7ebe243a2a36e7577d070f1275f2ec47 (patch)
tree0cbfa6cd832b6f20ea699e8f172b1b3afe96b2c2 /tools/configure
parent6a8beac59f5824e1fc826f513495fbb8478b79ce (diff)
parentd2b05885a28aafa331b25cdf3b647b782605df08 (diff)
downloadQt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.zip
Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.gz
Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.bz2
Merge earth-team into origin/master'
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 4503235..ab19a04 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -752,7 +752,7 @@ void Configure::parseCmdLine()
} else if ( configCmdLine.at(i) == "es2" ) {
dictionary[ "OPENGL_ES_2" ] = "yes";
} else if ( configCmdLine.at(i) == "desktop" ) {
- dictionary[ "OPENGL_ES_2" ] = "yes";
+ // OPENGL=yes suffices
} else {
cout << "Argument passed to -opengl option is not valid." << endl;
dictionary[ "DONE" ] = "error";