summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qmainwindow
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-07-23 11:35:27 +0200
committerStephan Binner <stephan.binner@basyskom.com>2017-07-25 11:23:58 +0000
commit2d02c4c799a4c45fe3f096a9bce95bd0b48b2743 (patch)
treeaec931e005823d86ac27da17a7126e1b84db6600 /tests/auto/widgets/widgets/qmainwindow
parent4d70a501dbbb9fd94818e30d9cd87a2482deb7e2 (diff)
Convert features.dockwidget to QT_[REQUIRE_]CONFIG
Change-Id: I1d4b0268df01f8bc0aec28af52cc4b639a376863 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qmainwindow')
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 680fea27dd..7942109a0a 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -29,8 +29,10 @@
#include <QtTest/QtTest>
-
+#include <QtWidgets/qtwidgetsglobal.h>
+#if QT_CONFIG(dockwidget)
#include <qdockwidget.h>
+#endif
#include <qlayout.h>
#include <qmainwindow.h>
#include <qmenubar.h>
@@ -148,7 +150,7 @@ private slots:
void QTBUG21378_animationFinished();
void resizeDocks();
void resizeDocks_data();
-#if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_TABBAR)
+#if QT_CONFIG(dockwidget) && !defined(QT_NO_TABBAR)
void QTBUG52175_tabifiedDockWidgetActivated();
#endif
};
@@ -2044,7 +2046,7 @@ void tst_QMainWindow::resizeDocks()
}
}
-#if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_TABBAR)
+#if QT_CONFIG(dockwidget) && !defined(QT_NO_TABBAR)
void tst_QMainWindow::QTBUG52175_tabifiedDockWidgetActivated()
{
QMainWindow w;