feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix tooltip build issue

Browse Source 
Change-Id: I9513172560c7a2556cf49ed5609ce227d0d7b18f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
This commit is contained in:
Henning Gruendl
2020-01-07 09:46:39 +01:00
committed by Henning Gründl
parent bb02ab161c
commit 59f08de43a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp
View File

@@ -40,8 +40,6 @@
#include "tooltip.h" #include "tooltip.h"
#include <qquickwindow.h> #include <qquickwindow.h>
#include <qquickitem.h> #include <qquickitem.h>
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
#include <QtQuick/QQuickRenderControl> #include <QtQuick/QQuickRenderControl>
#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtwidgetsglobal.h>
#include <qtooltip.h> #include <qtooltip.h>
@@ -55,9 +53,7 @@ void Tooltip::showText(QQuickItem *item, const QPointF &pos, const QString &str)
if (!item || !item->window()) if (!item || !item->window())
return; return;
if (QGuiApplicationPrivate::platformIntegration()-> if (QCoreApplication::instance()->inherits("QApplication")) {
hasCapability(QPlatformIntegration::MultipleWindows) &&
QCoreApplication::instance()->inherits("QApplication")) {
QPoint quickWidgetOffsetInTlw; QPoint quickWidgetOffsetInTlw;
QWindow *renderWindow = QQuickRenderControl::renderWindowFor(item->window(), &quickWidgetOffsetInTlw); QWindow *renderWindow = QQuickRenderControl::renderWindowFor(item->window(), &quickWidgetOffsetInTlw);
QWindow *window = renderWindow ? renderWindow : item->window(); QWindow *window = renderWindow ? renderWindow : item->window();