diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/kernel/qwidgetbackingstore.cpp | |
parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/kernel/qwidgetbackingstore.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 046bf743ab..bb421927db 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -48,7 +48,9 @@ #include <QtGui/qevent.h> #include <QtWidgets/qapplication.h> #include <QtGui/qpaintengine.h> +#if QT_CONFIG(graphicsview) #include <QtWidgets/qgraphicsproxywidget.h> +#endif #include <private/qwidget_p.h> #include <private/qapplication_p.h> @@ -821,7 +823,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy) const bool nativeWithTextureChild = textureChildSeen && q->internalWinId(); bool accelerateMove = accelEnv && isOpaque && !nativeWithTextureChild -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // No accelerate move for proxy widgets. && !tlw->d_func()->extra->proxyWidget #endif @@ -1235,7 +1237,7 @@ void QWidgetBackingStore::doSync() : wd->dirty); toClean += widgetDirty; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (tlw->d_func()->extra->proxyWidget) { resetWidget(w); continue; @@ -1320,7 +1322,7 @@ void QWidgetBackingStore::doSync() dirtyRenderToTextureWidgets.clear(); #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (tlw->d_func()->extra->proxyWidget) { updateStaticContentsSize(); dirty = QRegion(); |