diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-21 17:57:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 17:57:54 +0100 |
| commit | 46791c08e17740418cc701b8862a980c0f711b87 (patch) | |
| tree | bedba63fc48b80c2a2df54ea91c3f35398953aac /src/widgets/graphicsview | |
| parent | b8a38a6737acd670d92197ca5b009590d9fd8a9c (diff) | |
| parent | 9033977d3971db5352a2bb51052a723a2ac57a8f (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/graphicsview')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.cpp | 4 |
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 |