Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	configure
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/gui/image/qpnghandler.cpp
	src/network/access/qnetworkaccessdatabackend.cpp
	src/opengl/qgl_x11egl.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp

2 files changed, 24 insertions, 13 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 479fd4c..b22e05f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -739,6 +739,23 @@ void Configure::parseCmdLine()
         } else if (configCmdLine.at(i) == "-opengl-es-2") {
             dictionary[ "OPENGL" ]          = "yes";
             dictionary[ "OPENGL_ES_2" ]     = "yes";
+        } else if (configCmdLine.at(i) == "-opengl") {
+            dictionary[ "OPENGL" ]          = "yes";
+            i++;
+            if (i == argCount)
+                break;
+
+            if (configCmdLine.at(i) == "es1") {
+                dictionary[ "OPENGL_ES_CM" ]    = "yes";
+            } else if ( configCmdLine.at(i) == "es2" ) {
+                dictionary[ "OPENGL_ES_2" ]     = "yes";
+            } else if ( configCmdLine.at(i) == "desktop" ) {
+                dictionary[ "OPENGL_ES_2" ]     = "yes";
+            } else {
+                cout << "Argument passed to -opengl option is not valid." << endl;
+                dictionary[ "DONE" ] = "error";
+                break;
+            }
         }
 
         // OpenVG Support -------------------------------------------
@@ -1733,6 +1750,11 @@ bool Configure::displayHelp()
 
         desc("QT3SUPPORT", "no","-no-qt3support",       "Disables the Qt 3 support functionality.\n");
         desc("OPENGL", "no","-no-opengl",               "Disables OpenGL functionality\n");
+        desc("OPENGL", "no","-opengl <api>",            "Enable OpenGL support with specified API version.\n"
+                                                        "Available values for <api>:");
+        desc("", "", "",                                "  desktop - Enable support for Desktop OpenGL", ' ');
+        desc("OPENGL_ES_CM", "no", "",                  "  es1 - Enable support for OpenGL ES Common Profile", ' ');
+        desc("OPENGL_ES_2",  "no", "",                  "  es2 - Enable support for OpenGL ES 2.0", ' ');
 
         desc("OPENVG", "no","-no-openvg",               "Disables OpenVG functionality\n");
         desc("OPENVG", "yes","-openvg",                 "Enables OpenVG functionality");
@@ -1892,8 +1914,7 @@ bool Configure::displayHelp()
         desc("CETEST", "no",       "-no-cetest",           "Do not compile Windows CE remote test application");
         desc("CETEST", "yes",      "-cetest",              "Compile Windows CE remote test application");
         desc(                      "-signature <file>",    "Use file for signing the target project");
-        desc("OPENGL_ES_CM", "no", "-opengl-es-cm",        "Enable support for OpenGL ES Common");
-        desc("OPENGL_ES_2",  "no", "-opengl-es-2",         "Enable support for OpenGL ES 2.0");
+
         desc("DIRECTSHOW", "no",   "-phonon-wince-ds9",    "Enable Phonon Direct Show 9 backend for Windows CE");
 
         // Qt\Symbian only options go below here -----------------------------------------------------------------------------
@@ -2483,15 +2504,11 @@ void Configure::generateOutputVars()
         qtConfig += "no-gif";
     else if (dictionary[ "GIF" ] == "yes")
         qtConfig += "gif";
-    else if (dictionary[ "GIF" ] == "plugin")
-        qmakeFormatPlugins += "gif";
 
     if (dictionary[ "TIFF" ] == "no")
         qtConfig += "no-tiff";
     else if (dictionary[ "TIFF" ] == "yes")
         qtConfig += "tiff";
-    else if (dictionary[ "TIFF" ] == "plugin")
-        qmakeFormatPlugins += "tiff";
     if (dictionary[ "LIBTIFF" ] == "system")
         qtConfig += "system-tiff";
 
@@ -2499,8 +2516,6 @@ void Configure::generateOutputVars()
         qtConfig += "no-jpeg";
     else if (dictionary[ "JPEG" ] == "yes")
         qtConfig += "jpeg";
-    else if (dictionary[ "JPEG" ] == "plugin")
-        qmakeFormatPlugins += "jpeg";
     if (dictionary[ "LIBJPEG" ] == "system")
         qtConfig += "system-jpeg";
 
@@ -2819,8 +2834,6 @@ void Configure::generateOutputVars()
         qmakeVars += QString("styles         += ") + qmakeStyles.join(" ");
     if (!qmakeStylePlugins.isEmpty())
         qmakeVars += QString("style-plugins  += ") + qmakeStylePlugins.join(" ");
-    if (!qmakeFormatPlugins.isEmpty())
-        qmakeVars += QString("imageformat-plugins += ") + qmakeFormatPlugins.join(" ");
 
     if (dictionary["QMAKESPEC"].endsWith("-g++")) {
         QString includepath = qgetenv("INCLUDE");
@@ -3426,7 +3439,7 @@ void Configure::displayConfig()
         QString webkit = dictionary[ "WEBKIT" ];
         if (webkit == "debug")
             webkit = "yes (debug)";
-        cout << "WebKit support.............." << webkit;
+        cout << "WebKit support.............." << webkit << endl;
     }
     cout << "Declarative support........." << dictionary[ "DECLARATIVE" ] << endl;
     cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index b3c07f7..32d1860 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -122,8 +122,6 @@ private:
     QStringList qmakeStyles;
     QStringList qmakeStylePlugins;
 
-    QStringList qmakeFormatPlugins;
-
     QStringList qmakeVars;
     QStringList qmakeDefines;
     //  makeList[0] for qt and qtmain