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>
This commit is contained in:
Eike Ziller
2020-10-23 19:56:50 +02:00
parent 62e84f129a
commit 5e67bc5055
8 changed files with 17 additions and 5 deletions

View File

@@ -29,6 +29,7 @@
#include <utils/fileutils.h>
#include <QDebug>
#include <QString>
namespace QmlJS {

View File

@@ -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>

View File

@@ -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

View File

@@ -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

View File

@@ -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>

View File

@@ -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);

View File

@@ -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>

View File

@@ -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>