diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-17 19:28:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-17 19:28:59 (GMT) |
| commit | 9a5b5f4a70bad52b922fd0a2973b44dae945da13 (patch) | |
| tree | 26cd899828d57dfedd3ab1156ff46002021ecb01 /src | |
| parent | dcd7801b43e52dd733f459bffe97c9199b3070c4 (diff) | |
| parent | cef195120e95e7739325273608730af0a56e8106 (diff) | |
| download | Qt-9a5b5f4a70bad52b922fd0a2973b44dae945da13.zip Qt-9a5b5f4a70bad52b922fd0a2973b44dae945da13.tar.gz Qt-9a5b5f4a70bad52b922fd0a2973b44dae945da13.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.
Partially revert "Set the graphics system name in the graphics system factory."
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qgraphicssystem_runtime.cpp | 10 | ||||
| -rw-r--r-- | src/gui/painting/qgraphicssystemfactory.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp index 19b29a1..6d3f16e 100644 --- a/src/gui/painting/qgraphicssystem_runtime.cpp +++ b/src/gui/painting/qgraphicssystem_runtime.cpp @@ -330,11 +330,15 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem() { QApplicationPrivate::runtime_graphics_system = true; + if (!qgetenv("QT_DEFAULT_RUNTIME_SYSTEM").isEmpty()) { + m_graphicsSystemName = QString::fromLocal8Bit(qgetenv("QT_DEFAULT_RUNTIME_SYSTEM")); + } else { #ifdef QT_DEFAULT_RUNTIME_SYSTEM - m_graphicsSystemName = QLatin1String(QT_DEFAULT_RUNTIME_SYSTEM); - if (m_graphicsSystemName.isNull()) + m_graphicsSystemName = QLatin1String(QT_DEFAULT_RUNTIME_SYSTEM); + if (m_graphicsSystemName.isNull()) #endif - m_graphicsSystemName = QLatin1String("raster"); + m_graphicsSystemName = QLatin1String("raster"); + } #ifdef Q_OS_SYMBIAN m_windowSurfaceDestroyPolicy = DestroyAfterFirstFlush; 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")) |