Add runtime_graphics_system flag to QApplicationPrivate.

This flag can be internally used to detect if
QRuntimeGraphicsSystem is used. In some cases Qt needs
to know if runtime graphics system is used and it's
better to have a flag than relsolving graphics system
name every time.

Reviewed-by: Jason Barron

3 files changed, 7 insertions, 1 deletions

diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index 1c5d944..32a8578 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -344,6 +344,7 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
 	m_graphicsSystem(0), m_graphicsSystemChangeMemoryLimit(0)
 {
     QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
+    QApplicationPrivate::runtime_graphics_system = true;
 
 #ifdef Q_OS_SYMBIAN
     m_graphicsSystemName = QLatin1String("openvg");
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index 2fe9036..02a8b80 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -43,6 +43,7 @@
 #include <qwidget.h>
 #include <private/qwidget_p.h>
 #include <private/qbackingstore_p.h>
+#include <private/qapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -116,6 +117,10 @@ public:
 QWindowSurface::QWindowSurface(QWidget *window)
     : d_ptr(new QWindowSurfacePrivate(window))
 {
+    if (!QApplicationPrivate::runtime_graphics_system) {
+        if(window)
+            window->setWindowSurface(this);
+    }
 }
 
 /*!
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 93d4d18..477bd93 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -88,7 +88,7 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget)
 QS60WindowSurface::~QS60WindowSurface()
 {
 #if defined(QT_GRAPHICSSYSTEM_RUNTIME) && defined(Q_SYMBIAN_SUPPORTS_SURFACES)
-    if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+    if(QApplicationPrivate::runtime_graphics_system) {
         QRuntimeGraphicsSystem *runtimeGraphicsSystem =
                 static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
         if(runtimeGraphicsSystem->graphicsSystemName() == QLatin1String("openvg")) {