summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-07-23 11:37:00 +0200
committerStephan Binner <stephan.binner@basyskom.com>2017-07-25 11:24:02 +0000
commit7964b7468de65459f3c0e431549fa93408c19a62 (patch)
tree5394150669c6c454ddffc3582b33bfe4f39564e8 /tests
parent2d02c4c799a4c45fe3f096a9bce95bd0b48b2743 (diff)
Convert features.tabbar to QT_[REQUIRE_]CONFIG
Change-Id: Id21a95cbc61b2559a8f517ee60548b61536e3cc4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 7942109a0a..292080c55f 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -47,7 +47,7 @@
#include <private/qmainwindowlayout_p.h>
#include <private/qdockarealayout_p.h>
-#ifndef QT_NO_TABBAR
+#if QT_CONFIG(tabbar)
#include <qtabbar.h>
#endif
@@ -150,7 +150,7 @@ private slots:
void QTBUG21378_animationFinished();
void resizeDocks();
void resizeDocks_data();
-#if QT_CONFIG(dockwidget) && !defined(QT_NO_TABBAR)
+#if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
void QTBUG52175_tabifiedDockWidgetActivated();
#endif
};
@@ -2046,7 +2046,7 @@ void tst_QMainWindow::resizeDocks()
}
}
-#if QT_CONFIG(dockwidget) && !defined(QT_NO_TABBAR)
+#if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
void tst_QMainWindow::QTBUG52175_tabifiedDockWidgetActivated()
{
QMainWindow w;