diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-07 06:59:55 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-07 06:59:55 (GMT) |
| commit | b2799a705b6d7655bb23ec4121fd76ce8a94b344 (patch) | |
| tree | db7e2a482ca35a40ca7cfb4f4999ec15396a8b55 /src/gui/painting | |
| parent | 6415e22649dd8620728c8c32b918c7afb8efc4dc (diff) | |
| parent | e6843c5a9cf4949e7521c1304bb5dc5d48fbc9be (diff) | |
| download | Qt-b2799a705b6d7655bb23ec4121fd76ce8a94b344.zip Qt-b2799a705b6d7655bb23ec4121fd76ce8a94b344.tar.gz Qt-b2799a705b6d7655bb23ec4121fd76ce8a94b344.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qgraphicssystemfactory.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index 4309140..01ece09 100644 --- a/src/gui/painting/qgraphicssystemfactory.cpp +++ b/src/gui/painting/qgraphicssystemfactory.cpp @@ -74,7 +74,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) || defined(Q_WS_X11) || (defined (Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) +#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN) || defined(Q_WS_X11) if (system.isEmpty()) { system = QLatin1String("raster"); } diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 5a566d1..435e12a 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -2737,7 +2737,7 @@ QRectF QPainter::clipBoundingRect() const } // Accumulate the bounding box in device space. This is not 100% - // precise, but it fits within the guarantee and it is resonably + // precise, but it fits within the guarantee and it is reasonably // fast. QRectF bounds; for (int i=0; i<d->state->clipInfo.size(); ++i) { |