From 7d3e9074e16209d9df3e910834115c9a96c70318 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 25 Jun 2017 17:55:23 +0200
Subject: Convert features.tooltip to QT_CONFIG

Change-Id: I4638457a51a72666b4c73130f4a856ad93ca2f13
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/controls/Private/qquicktooltip.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp
index c8eb81f6..88a82e6c 100644
--- a/src/controls/Private/qquicktooltip.cpp
+++ b/src/controls/Private/qquicktooltip.cpp
@@ -44,9 +44,12 @@
 #include <qpa/qplatformintegration.h>
 #include <QtQuick/QQuickRenderControl>
 
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB)
+#include <QtWidgets/qtwidgetsglobal.h>
+#if QT_CONFIG(tooltip)
 #include <qtooltip.h>
 #endif
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -60,7 +63,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin
 {
     if (!item || !item->window())
         return;
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB) && QT_CONFIG(tooltip)
     if (QGuiApplicationPrivate::platformIntegration()->
             hasCapability(QPlatformIntegration::MultipleWindows) &&
         QCoreApplication::instance()->inherits("QApplication")) {
@@ -80,7 +83,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin
 
 void QQuickTooltip1::hideText()
 {
-#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP)
+#if defined(QT_WIDGETS_LIB) && QT_CONFIG(tooltip)
     QToolTip::hideText();
 #endif
 }
-- 
cgit v1.2.1