diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:33 +0100 |
| commit | bb3872d60975724a50ff910b6dd108d1944db597 (patch) | |
| tree | ce1c96729a1a4691a322b36cfd5429c020403ccc /tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp | |
| parent | b72b5cd76004e54dc00c0f1133f4d59192ef154a (diff) | |
| parent | 8e387e7fa758ded3f0d096dcf5fe13a22521dad7 (diff) | |
Merge 5.10 into 5.10.0
Change-Id: Ibfbaa8ef89cf45b87a2c65f1da4a708e5464f259
Diffstat (limited to 'tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp index 1824285f05..28731223a9 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp +++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp @@ -38,13 +38,9 @@ #include <qmainwindow.h> #include <qmenubar.h> -static inline void setFrameless(QWidget *w) -{ - Qt::WindowFlags flags = w->windowFlags(); - flags |= Qt::FramelessWindowHint; - flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); - w->setWindowFlags(flags); -} +#include <QtTest/private/qtesthelpers_p.h> + +using namespace QTestPrivate; class tst_QWidgetAction : public QObject { |