From 736e6eada024fc56546407c725dbed3e9247ba62 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 19 Jun 2020 16:12:42 +0200 Subject: [PATCH] Various Qt6 compile fixes Task-number: QTCREATORBUG-24098 Change-Id: Ia0fe92d82d4477bd8f14ee25754b114316fc878a Reviewed-by: Eike Ziller --- src/libs/utils/porting.h | 6 ++++++ src/plugins/coreplugin/dialogs/codecselector.h | 1 + src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp | 2 +- src/plugins/coreplugin/editormanager/editormanager.h | 2 +- src/plugins/coreplugin/externaltool.cpp | 2 +- src/plugins/coreplugin/icore.h | 3 +-- src/plugins/coreplugin/ifilewizardextension.h | 4 ++-- src/plugins/coreplugin/mainwindow.cpp | 1 + src/plugins/coreplugin/menubarfilter.cpp | 3 ++- src/plugins/imageviewer/multiexportdialog.cpp | 3 ++- src/plugins/texteditor/behaviorsettingspage.h | 4 ++++ 11 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h index a83631617c8..30db1eb8924 100644 --- a/src/libs/utils/porting.h +++ b/src/libs/utils/porting.h @@ -37,4 +37,10 @@ constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts; constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts; #endif +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +using QHashSeedType = uint; +#else +using QHashSeedType = size_t; +#endif + } // namespace Utils diff --git a/src/plugins/coreplugin/dialogs/codecselector.h b/src/plugins/coreplugin/dialogs/codecselector.h index f2495bcc051..df65a6cff92 100644 --- a/src/plugins/coreplugin/dialogs/codecselector.h +++ b/src/plugins/coreplugin/dialogs/codecselector.h @@ -31,6 +31,7 @@ #include #include #include +#include namespace Utils { class ListWidget; } namespace Core { class BaseTextDocument; } diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 36e981636f9..30abcb3d38f 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -465,7 +465,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths) // Also save the buttongroup for every file to get the result for each entry. buttonGroups.append({filePath, radioButtonGroup}); - QObject::connect(radioButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), + QObject::connect(radioButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), [this] { updateSelectAll(); }); } diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index 0cf3412442f..2d8f9eb8f3b 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -29,6 +29,7 @@ #include "../idocument.h" #include "documentmodel.h" +#include "ieditor.h" #include "utils/textfileformat.h" @@ -43,7 +44,6 @@ namespace Utils { class MimeType; } namespace Core { -class IEditor; class IDocument; class SearchResultItem; diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp index f6e8b039787..ae8dae407c8 100644 --- a/src/plugins/coreplugin/externaltool.cpp +++ b/src/plugins/coreplugin/externaltool.cpp @@ -453,7 +453,7 @@ ExternalTool * ExternalTool::createFromXml(const QByteArray &xml, QString *error tool->m_environment = EnvironmentItem::fromStringList(lines); } else { reader.raiseError(QString::fromLatin1("Unknown element <%1> as subelement of <%2>").arg( - reader.qualifiedName().toString(), kExecutable)); + reader.qualifiedName().toString(), QString(kExecutable))); break; } } diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 261fd99b34a..f5f5e261e14 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -26,7 +26,7 @@ #pragma once #include "core_global.h" -#include "id.h" +#include "icontext.h" #include #include @@ -48,7 +48,6 @@ class InfoBar; namespace Core { class Context; -class IContext; class IWizardFactory; class SettingsDatabase; diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index ac37230faf2..f4c733a21b0 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -25,7 +25,8 @@ #pragma once -#include +#include "core_global.h" +#include "generatedfile.h" #include #include @@ -38,7 +39,6 @@ QT_END_NAMESPACE namespace Core { class IWizardFactory; -class GeneratedFile; /*! Hook to add generic wizard pages to implementations of IWizard. diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 2109dc27e61..ed90caea2d2 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -76,6 +76,7 @@ #include #include +#include #include #include #include diff --git a/src/plugins/coreplugin/menubarfilter.cpp b/src/plugins/coreplugin/menubarfilter.cpp index 6b8181b3ff0..2a23bb4cda7 100644 --- a/src/plugins/coreplugin/menubarfilter.cpp +++ b/src/plugins/coreplugin/menubarfilter.cpp @@ -32,6 +32,7 @@ #include "locator/locatormanager.h" #include +#include #include #include @@ -41,7 +42,7 @@ #include QT_BEGIN_NAMESPACE -uint qHash(const QPointer &p, uint seed) +uint qHash(const QPointer &p, Utils::QHashSeedType seed) { return qHash(p.data(), seed); } diff --git a/src/plugins/imageviewer/multiexportdialog.cpp b/src/plugins/imageviewer/multiexportdialog.cpp index a09e2e2db29..f9eb2a298fe 100644 --- a/src/plugins/imageviewer/multiexportdialog.cpp +++ b/src/plugins/imageviewer/multiexportdialog.cpp @@ -300,7 +300,8 @@ void MultiExportDialog::accept() } if (data.size() > 1 && data.at(0).fileName == data.at(1).fileName) { QMessageBox::warning(this, windowTitle(), - tr("The file name must contain one of the placeholders %1, %2.").arg("%1", "%2")); + tr("The file name must contain one of the placeholders %1, %2.") + .arg(QString("%1"), QString("%2"))); return; } diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index 66ae00377ec..469b73255f6 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -31,6 +31,10 @@ #include +QT_BEGIN_NAMESPACE +class QTextCodec; +QT_END_NAMESPACE + namespace TextEditor { class TabSettings;