diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2020-01-07 09:46:39 +0100 |
|---|---|---|
| committer | Henning Gründl <henning.gruendl@qt.io> | 2020-01-07 09:35:41 +0000 |
| commit | 59f08de43a9f0d90aa483cea625141b71b4ca029 (patch) | |
| tree | f903030b10ca2cdf903a8939d56ac31e7912373d | |
| parent | bb02ab161cf956f616ad93da09baf62919641ac5 (diff) | |
| download | qt-creator-59f08de43a9f0d90aa483cea625141b71b4ca029.tar.gz | |
QmlDesigner: Fix tooltip build issue
Change-Id: I9513172560c7a2556cf49ed5609ce227d0d7b18f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp index 7e4e03fa60..ec4085ef83 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp @@ -40,8 +40,6 @@ #include "tooltip.h" #include <qquickwindow.h> #include <qquickitem.h> -#include <private/qguiapplication_p.h> -#include <qpa/qplatformintegration.h> #include <QtQuick/QQuickRenderControl> #include <QtWidgets/qtwidgetsglobal.h> #include <qtooltip.h> @@ -55,9 +53,7 @@ void Tooltip::showText(QQuickItem *item, const QPointF &pos, const QString &str) if (!item || !item->window()) return; - if (QGuiApplicationPrivate::platformIntegration()-> - hasCapability(QPlatformIntegration::MultipleWindows) && - QCoreApplication::instance()->inherits("QApplication")) { + if (QCoreApplication::instance()->inherits("QApplication")) { QPoint quickWidgetOffsetInTlw; QWindow *renderWindow = QQuickRenderControl::renderWindowFor(item->window(), &quickWidgetOffsetInTlw); QWindow *window = renderWindow ? renderWindow : item->window(); |