summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qgraphicssystemfactory.cpp
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2011-11-16 11:17:04 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-11-16 11:17:04 (GMT)
commita7c77bd46ef85bae624e829cb2a02110ec60b318 (patch)
treedd2ba97c62347116b866ce3bf626cab9cb729d8e /src/gui/painting/qgraphicssystemfactory.cpp
parent6ca7e2a2118f717a5285dadc16a9ce5fbbab266d (diff)
downloadQt-a7c77bd46ef85bae624e829cb2a02110ec60b318.zip
Qt-a7c77bd46ef85bae624e829cb2a02110ec60b318.tar.gz
Qt-a7c77bd46ef85bae624e829cb2a02110ec60b318.tar.bz2
Partially revert "Set the graphics system name in the graphics system factory."
This actually breaks runtime graphicssystem in all configurations as far as I can tell, but definitely in the following setup: -graphicssystem runtime -runtimegraphicssystem meego Qt creates the runtime graphicssystem, which then sees it should create a MeeGo GS instance. This then calls qgraphicssystemfactory::create("meego"), which was overwriting graphics_system_name (incorrectly!) Harmattan's Qt does not do this, and thus, is able to switch graphicssystems correctly. This partially reverts commit b595c2fbe0fa354190b713ef09dd1f348e22e2b6. Merge-request: 2718 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/painting/qgraphicssystemfactory.cpp')
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 01ece09..b817a90 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -45,7 +45,6 @@
#include "qmutex.h"
#include "qapplication.h"
-#include <private/qapplication_p.h>
#include "qgraphicssystem_raster_p.h"
#include "qgraphicssystem_runtime_p.h"
#include "qdebug.h"
@@ -80,7 +79,6 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
}
#endif
- QApplicationPrivate::graphics_system_name = system;
if (system == QLatin1String("raster"))
return new QRasterGraphicsSystem;
else if (system == QLatin1String("runtime"))