From 3835194d340f8756d2ac7a5f9ae2a3519cb891b9 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 9 Jul 2017 11:04:38 +0200
Subject: Convert features.rubberband to QT_[REQUIRE_]CONFIG

Change-Id: I6d634bafa6d26c1e78069fddd412e6de24f5775c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qmainwindowlayout.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/widgets/widgets/qmainwindowlayout.cpp')

diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index d31fa3ddfa..1393294f0a 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -49,7 +49,9 @@
 #include "qtoolbar.h"
 #include "qtoolbarlayout_p.h"
 #include "qwidgetanimator_p.h"
+#if QT_CONFIG(rubberband)
 #include "qrubberband.h"
+#endif
 #include "qtabbar_p.h"
 
 #include <qapplication.h>
@@ -2449,7 +2451,7 @@ QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, bool group)
 
 void QMainWindowLayout::updateGapIndicator()
 {
-#ifndef QT_NO_RUBBERBAND
+#if QT_CONFIG(rubberband)
     if ((!widgetAnimator.animating() && !currentGapPos.isEmpty())
 #if QT_CONFIG(dockwidget)
         || currentHoveredFloat
@@ -2477,7 +2479,7 @@ void QMainWindowLayout::updateGapIndicator()
     } else if (gapIndicator) {
         gapIndicator->hide();
     }
-#endif //QT_NO_RUBBERBAND
+#endif // QT_CONFIG(rubberband)
 }
 
 void QMainWindowLayout::hover(QLayoutItem *widgetItem, const QPoint &mousePos)
-- 
cgit v1.2.3