summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-01-06 12:21:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 14:58:48 +0100
commit03b6a2f0f98b70b24c0cce645d6d58c084111f91 (patch)
tree071097ba946739bf8604572dd9d6a7a82f9aa593
parentbbee8ca485acc6bad7021f4e1cb3e5b8cd32e8fc (diff)
Mac: Improve transformed QGraphicsProxyWidgets
Restore Mac code paths from Qt 4. Task-number: QTBUG-29139 Change-Id: I2893ddf6015e2bda92d4a16980dbe2c9021eeef7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index ccc51120a9..40d32ea1d5 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -2274,7 +2274,7 @@ void QGraphicsWidget::paintWindowFrame(QPainter *painter, const QStyleOptionGrap
const QPointF styleOrigin = this->windowFrameRect().topLeft();
painter->translate(styleOrigin);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const QSize pixmapSize = windowFrameRect.size();
if (pixmapSize.width() <= 0 || pixmapSize.height() <= 0)
return;
@@ -2342,7 +2342,7 @@ void QGraphicsWidget::paintWindowFrame(QPainter *painter, const QStyleOptionGrap
frameOptions.midLineWidth = 1;
style()->drawPrimitive(QStyle::PE_FrameWindow, &frameOptions, painter, widget);
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
realPainter->drawPixmap(QPoint(), pm);
delete painter;
#endif