summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2011-01-21 11:55:23 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2011-01-21 12:34:57 (GMT)
commitb595c2fbe0fa354190b713ef09dd1f348e22e2b6 (patch)
tree561d5482546250f44abe6d6a65f020b48711c322 /src
parent6482a5c5e272d79c312a5f5ef16ee2adf21f4504 (diff)
downloadQt-b595c2fbe0fa354190b713ef09dd1f348e22e2b6.zip
Qt-b595c2fbe0fa354190b713ef09dd1f348e22e2b6.tar.gz
Qt-b595c2fbe0fa354190b713ef09dd1f348e22e2b6.tar.bz2
Set the graphics system name in the graphics system factory.
This allows us to know which graphics system is in use at runtime. Reviewed-by: Jani Hautakangas
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qgraphicssystem_runtime.cpp1
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index a9fbbee..bd27e9d 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -322,7 +322,6 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
: m_windowSurfaceDestroyPolicy(DestroyImmediately),
m_graphicsSystem(0)
{
- QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
QApplicationPrivate::runtime_graphics_system = true;
#ifdef QT_DEFAULT_RUNTIME_SYSTEM
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 3adeba4..1416f7c 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -45,6 +45,7 @@
#include "qmutex.h"
#include "qapplication.h"
+#include <private/qapplication_p.h>
#include "qgraphicssystem_raster_p.h"
#include "qgraphicssystem_runtime_p.h"
#include "qdebug.h"
@@ -79,6 +80,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
}
#endif
+ QApplicationPrivate::graphics_system_name = system;
if (system == QLatin1String("raster"))
return new QRasterGraphicsSystem;
else if (system == QLatin1String("runtime"))