diff options
| -rw-r--r-- | src/widgets/kernel/qwidgetbackingstore_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h index 69f8a0708e..a4d4ee2f71 100644 --- a/src/widgets/kernel/qwidgetbackingstore_p.h +++ b/src/widgets/kernel/qwidgetbackingstore_p.h @@ -240,7 +240,7 @@ private: } inline bool hasStaticContents() const - { return !staticWidgets.isEmpty(); } + { return !staticWidgets.isEmpty() && false; } friend QRegion qt_dirtyRegion(QWidget *); friend class QWidgetPrivate; diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index a84709a6dd..f3f63b2067 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -3550,9 +3550,7 @@ void tst_QWidget::optimizedResizeMove() void tst_QWidget::optimizedResize_topLevel() { -#if defined(Q_OS_MAC) - QSKIP("We do not yet have static contents support for *top-levels* on this platform"); -#endif + QSKIP("We do not yet have static contents support, see QTBUG-28012"); StaticWidget topLevel; topLevel.gotPaintEvent = false; |