From 5e67bc50555d54dde97682c67cd9c325d9260023 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 23 Oct 2020 19:56:50 +0200
Subject: [PATCH] Fix build with Qt6

Add missing includes for "incomplete type" issues.
Remove usage of QDesktopWidget.
Don't compile native WebKit help backend (missing native widget integration).
Add SvgWidget dependency.

Task-number: QTCREATORBUG-24098
Change-Id: I1b3afb54d385940ff283824870fa7454866212a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/libs/qmljs/qmljsdialect.h                              | 1 +
 src/plugins/cpptools/cppcodestylesettingspage.cpp          | 1 +
 src/plugins/help/CMakeLists.txt                            | 2 +-
 src/plugins/imageviewer/CMakeLists.txt                     | 7 ++++++-
 .../projectexplorer/editorsettingspropertiespage.cpp       | 5 +++++
 .../components/previewtooltip/previewtooltipbackend.cpp    | 4 +---
 src/plugins/qmljstools/qmljscodestylesettingspage.cpp      | 1 +
 src/plugins/texteditor/snippets/snippetssettingspage.cpp   | 1 +
 8 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h
index 230642e1454..a2f28225990 100644
--- a/src/libs/qmljs/qmljsdialect.h
+++ b/src/libs/qmljs/qmljsdialect.h
@@ -29,6 +29,7 @@
 
 #include <utils/fileutils.h>
 
+#include <QDebug>
 #include <QString>
 
 namespace QmlJS {
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index 1f29bac9f15..0e9d576c46b 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -36,6 +36,7 @@
 #include <coreplugin/icore.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/codestyleeditor.h>
+#include <texteditor/fontsettings.h>
 #include <texteditor/icodestylepreferencesfactory.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/displaysettings.h>
diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt
index 4d5fd23283e..6ed078497b3 100644
--- a/src/plugins/help/CMakeLists.txt
+++ b/src/plugins/help/CMakeLists.txt
@@ -32,7 +32,7 @@ extend_qtc_plugin(Help
 )
 
 extend_qtc_plugin(Help
-  CONDITION FWWebKit AND FWAppKit
+  CONDITION FWWebKit AND FWAppKit AND Qt5_VERSION VERSION_LESS 6.0.0
   FEATURE_INFO "Native WebKit help viewer"
   DEPENDS ${FWWebKit} ${FWAppKit}
   DEFINES QTC_MAC_NATIVE_HELPVIEWER
diff --git a/src/plugins/imageviewer/CMakeLists.txt b/src/plugins/imageviewer/CMakeLists.txt
index 6bf9c9693c5..5317e9321de 100644
--- a/src/plugins/imageviewer/CMakeLists.txt
+++ b/src/plugins/imageviewer/CMakeLists.txt
@@ -1,5 +1,10 @@
+find_package(Qt5 COMPONENTS SvgWidgets QUIET)
+if (TARGET Qt5::SvgWidgets)
+  set(SVG_WIDGETS Qt5::SvgWidgets)
+endif()
+
 add_qtc_plugin(ImageViewer
-  DEPENDS OptionalSvg
+  DEPENDS OptionalSvg ${SVG_WIDGETS}
   PLUGIN_DEPENDS Core
   SOURCES
     exportdialog.cpp exportdialog.h
diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
index ba76cb078eb..1a9ede8c850 100644
--- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp
@@ -26,7 +26,12 @@
 #include "editorsettingspropertiespage.h"
 #include "editorconfiguration.h"
 #include "project.h"
+
+#include <texteditor/behaviorsettings.h>
+#include <texteditor/extraencodingsettings.h>
 #include <texteditor/marginsettings.h>
+#include <texteditor/storagesettings.h>
+#include <texteditor/typingsettings.h>
 
 #include <QTextCodec>
 
diff --git a/src/plugins/qmldesigner/components/previewtooltip/previewtooltipbackend.cpp b/src/plugins/qmldesigner/components/previewtooltip/previewtooltipbackend.cpp
index 559cd5c17b9..4fac1432e58 100644
--- a/src/plugins/qmldesigner/components/previewtooltip/previewtooltipbackend.cpp
+++ b/src/plugins/qmldesigner/components/previewtooltip/previewtooltipbackend.cpp
@@ -31,7 +31,6 @@
 #include <imagecache.h>
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QMetaObject>
 
 namespace QmlDesigner {
@@ -65,8 +64,7 @@ void PreviewTooltipBackend::showTooltip()
         },
         [] {});
 
-    auto desktopWidget = QApplication::desktop();
-    auto mousePosition = desktopWidget->cursor().pos();
+    auto mousePosition = QCursor::pos();
 
     mousePosition += {20, 20};
     m_tooltip->move(mousePosition);
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 560fce6f706..f99f98f1b36 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -30,6 +30,7 @@
 #include "qmljsindenter.h"
 #include "qmljsqtstylecodeformatter.h"
 
+#include <texteditor/fontsettings.h>
 #include <texteditor/snippets/snippetprovider.h>
 #include <texteditor/tabsettings.h>
 #include <texteditor/simplecodestylepreferences.h>
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 802c9e456e7..c69002f6b9f 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -32,6 +32,7 @@
 #include "ui_snippetssettingspage.h"
 
 #include <coreplugin/icore.h>
+#include <texteditor/fontsettings.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditorconstants.h>
 #include <texteditor/texteditorsettings.h>