summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-06-25 15:55:23 (GMT)
committerStephan Binner <stephan.binner@basyskom.com>2017-06-27 12:57:26 (GMT)
commit7d3e9074e16209d9df3e910834115c9a96c70318 (patch)
tree0df0be9ce6d912f0e8ed041d35009e17141c9211
parentf19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff)
downloadqtquickcontrols-7d3e9074e16209d9df3e910834115c9a96c70318.tar.gz
Convert features.tooltip to QT_CONFIG
Change-Id: I4638457a51a72666b4c73130f4a856ad93ca2f13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--src/controls/Private/qquicktooltip.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp
index c8eb81f..88a82e6 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
}