diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 12:50:32 +0200 |
| commit | 0efe37f9304b54912aff52bbe98083702d5b1f22 (patch) | |
| tree | 5997e538f7024039f3e822a129129f35efb792ef /src/controls/Private/qquicktooltip.cpp | |
| parent | b3ab05a86bbc6aa2643ba0e0512cdb0f69f29fb4 (diff) | |
| parent | 2ae698e2cb403dae021596606d14ff23ec48ec4a (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I9253c87c3bd54204401070f492c7590166be0fe3
Diffstat (limited to 'src/controls/Private/qquicktooltip.cpp')
| -rw-r--r-- | src/controls/Private/qquicktooltip.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/controls/Private/qquicktooltip.cpp b/src/controls/Private/qquicktooltip.cpp index e09a6b762..30ac58eed 100644 --- a/src/controls/Private/qquicktooltip.cpp +++ b/src/controls/Private/qquicktooltip.cpp @@ -44,6 +44,7 @@ #include <qquickitem.h> #include <private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> +#include <QtQuick/private/qquickrendercontrol_p.h> #ifdef QT_WIDGETS_LIB #include <qtooltip.h> @@ -64,8 +65,12 @@ void QQuickTooltip::showText(QQuickItem *item, const QPointF &pos, const QString #ifdef QT_WIDGETS_LIB if (QGuiApplicationPrivate::platformIntegration()-> hasCapability(QPlatformIntegration::MultipleWindows) && - QCoreApplication::instance()->inherits("QApplication")) - QToolTip::showText(item->window()->mapToGlobal(item->mapToScene(pos).toPoint()), str); + QCoreApplication::instance()->inherits("QApplication")) { + QWindow *renderWindow = QQuickRenderControl::renderWindowFor(item->window()); + QWindow *window = renderWindow ? renderWindow : item->window(); + QPoint mappedPos = window->mapToGlobal(item->mapToScene(pos).toPoint()); + QToolTip::showText(mappedPos, str); + } #else Q_UNUSED(item); Q_UNUSED(pos); |