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

Conflicts:
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
	src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h

2 files changed, 10 insertions, 4 deletions

diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 6d578d3..af5d85e 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -125,9 +125,6 @@ static QString get_network_interface();
 
 void QNetworkSessionPrivateImpl::iapStateChanged(const QString& iapid, uint icd_connection_state)
 {
-    if ((publicConfig.type() == QNetworkConfiguration::UserChoice) && opened) {
-        updateIdentifier(iapid);
-    }
 
     if (((publicConfig.type() == QNetworkConfiguration::UserChoice) &&
          (activeConfig.identifier() == iapid)) ||
@@ -149,6 +146,9 @@ void QNetworkSessionPrivateImpl::iapStateChanged(const QString& iapid, uint icd_
             break;
         }
     }
+    if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
+        updateIdentifier(iapid);
+    }
 }
 
 void QNetworkSessionPrivateImpl::cleanupSession(void)
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 20b092e..a70d232 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -42,6 +42,7 @@
 #include <QDebug>
 #include <private/qpixmap_raster_p.h>
 #include <private/qwindowsurface_gl_p.h>
+#include <private/qwindowsurface_raster_p.h>
 #include <private/qegl_p.h>
 #include <private/qglextensions_p.h>
 #include <private/qgl_p.h>
@@ -75,7 +76,12 @@ QMeeGoGraphicsSystem::~QMeeGoGraphicsSystem()
 
 QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
-    QGLShareContextScope ctx(qt_gl_share_widget()->context());
+    QGLWidget *shareWidget = qt_gl_share_widget();
+
+    if (!shareWidget)
+        return new QRasterWindowSurface(widget);
+
+    QGLShareContextScope ctx(shareWidget->context());
 
     QMeeGoGraphicsSystem::surfaceWasCreated = true;
     QWindowSurface *surface = new QGLWindowSurface(widget);