diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-31 09:04:18 +0200 |
| commit | 9f085b889524a80d4064d6ac01dbdc817bb31060 (patch) | |
| tree | a65a8871f44a0572e1459dd14759b2339f93de5e /src/controls/Private/qquicktooltip.cpp | |
| parent | 9a56985c91d16d7c42ba86f4b0a70f85973e0618 (diff) | |
| parent | 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 (diff) | |
| download | qtquickcontrols-9f085b889524a80d4064d6ac01dbdc817bb31060.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia574913a1c2af6349db33966c172e96f6eb5f127
Diffstat (limited to 'src/controls/Private/qquicktooltip.cpp')
| -rw-r--r-- | src/controls/Private/qquicktooltip.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp index aa09ea6b..c8eb81f6 100644 --- a/src/controls/Private/qquicktooltip.cpp +++ b/src/controls/Private/qquicktooltip.cpp @@ -44,7 +44,7 @@ #include <qpa/qplatformintegration.h> #include <QtQuick/QQuickRenderControl> -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) #include <qtooltip.h> #endif @@ -60,7 +60,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin { if (!item || !item->window()) return; -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) if (QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows) && QCoreApplication::instance()->inherits("QApplication")) { @@ -80,7 +80,7 @@ void QQuickTooltip1::showText(QQuickItem *item, const QPointF &pos, const QStrin void QQuickTooltip1::hideText() { -#ifdef QT_WIDGETS_LIB +#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_TOOLTIP) QToolTip::hideText(); #endif } |