diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 00:24:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 00:24:38 (GMT) |
| commit | 9ca64357d6ad9a2a9dd212fc5962169ed2c4bbc1 (patch) | |
| tree | 1e4213f2b0b33c334f754b7cd964d010aa82cc78 /src/gui/painting | |
| parent | b9af296af3d4792d591afd833301ce56bcbc7b55 (diff) | |
| parent | 30e8b82d74c4c57b60f2f06b61254de6572eaecf (diff) | |
| download | Qt-9ca64357d6ad9a2a9dd212fc5962169ed2c4bbc1.zip Qt-9ca64357d6ad9a2a9dd212fc5962169ed2c4bbc1.tar.gz Qt-9ca64357d6ad9a2a9dd212fc5962169ed2c4bbc1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Rename some variables to improve readability.
Make QStaticText honor QPainter::pen() for rich text on X11 w/raster
Fixed qdeclarativetext auto-test to work with raster graphicssystem.
Fixed QStaticText auto-test to work with raster graphicssystem.
Give a warning in QPixmap::handle() if pixmap is not X11 class.
QThreadPool: name pooled threads
Make raster the default graphics system on X11.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qgraphicssystemfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index ee6fbd8..3adeba4 100644 --- a/src/gui/painting/qgraphicssystemfactory.cpp +++ b/src/gui/painting/qgraphicssystemfactory.cpp @@ -73,7 +73,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key) if (system.isEmpty()) { system = QLatin1String("runtime"); } -#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN) +#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN) || defined(Q_WS_X11) if (system.isEmpty()) { system = QLatin1String("raster"); } |