summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Krupenko <krnekit@gmail.com>2017-03-30 22:46:02 +0300
committerStephan Binner <stephan.binner@basyskom.com>2017-03-31 09:45:53 +0000
commit8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (patch)
tree9059855eb656a95b2c2c1ccefe8119c62e68b8dc
parente9af32fcd4cb67b6cb932438c07a839dcf27f10a (diff)
Fix warnings for -no-feature-dockwidgetv5.9.0-beta1
This amends commit c20cd4d98ea43275bd8859581e273d69a90c3413 Change-Id: I2fa903209694cd05e0dcf31e6f92d96ed934c91d Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/widgets/widgets/qmainwindowlayout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index d15af3505b..d31fa3ddfa 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -2432,7 +2432,7 @@ QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, bool group)
}
#endif
-#if !QT_CONFIG(dockwidget) && !QT_CONFIG(tabbar)
+#if !QT_CONFIG(dockwidget) || !QT_CONFIG(tabbar)
Q_UNUSED(group);
#endif