Even more Qt6 porting

Task-number: QTCREATORBUG-24098
Change-Id: Ib6ef0e521483153c9716c9a1870072e836d6b026
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

10 files changed, 29 insertions, 11 deletions

diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index b2912ceb42e..98e003135e8 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -933,7 +933,11 @@ void PreviewDialog::setPixmap(const QPixmap &p, int zoom)
     m_label->adjustSize();
     m_zoom = zoom;
     m_label->setZoom(m_zoom);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QSize size = m_label->pixmap().size() + QSize(54, 44);
+#else
     QSize size = m_label->pixmap()->size() + QSize(54, 44);
+#endif
     if (size.width() < 180)
         size.setWidth(180);
     resize(size);
diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp
index d0ab7cff286..efd019c2eab 100644
--- a/src/plugins/languageclient/languageclientsymbolsupport.cpp
+++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp
@@ -33,6 +33,8 @@
 
 #include <utils/mimetypes/mimedatabase.h>
 
+#include <QFile>
+
 using namespace LanguageServerProtocol;
 
 namespace LanguageClient {
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index cf907e13977..a97bd7ff502 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -41,6 +41,7 @@
 #include <utils/treeviewcombobox.h>
 #include <utils/utilsicons.h>
 
+#include <QActionGroup>
 #include <QFile>
 #include <QMenu>
 #include <QTextDocument>
@@ -224,7 +225,7 @@ void updateEditorToolBar(Core::IEditor *editor)
         actions[widget] = widget->toolBar()->addAction(
             icon, client->name(), [document]() {
                 auto menu = new QMenu;
-                auto *clientsGroup = new QActionGroup(menu);
+                auto clientsGroup = new QActionGroup(menu);
                 clientsGroup->setExclusive(true);
                 for (auto client : LanguageClientManager::clientsSupportingDocument(document)) {
                     auto action = clientsGroup->addAction(client->name());
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 315b3c22e9e..8cc8bcb2895 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -27,13 +27,12 @@
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
-
 #include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QString>
 #include <QStringList>
 #include <QSysInfo>
@@ -456,7 +455,7 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
     if (machine.isEmpty())
         return Abi();
 
-    const QVector<QStringRef> parts = machine.splitRef(QRegExp("[ /-]"));
+    const QVector<QStringRef> parts = machine.splitRef(QRegularExpression("[ /-]"));
 
     Architecture arch = UnknownArchitecture;
     OS os = UnknownOS;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
index acdbf4dcb6e..2b838f90734 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
@@ -461,11 +461,14 @@ QWidget *SpacerField::createWidget(const QString &displayName, JsonFieldPage *pa
 {
     Q_UNUSED(displayName)
     Q_UNUSED(page)
-    int size = QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing) * m_factor;
+    int hspace = QApplication::style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
+    int vspace = QApplication::style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing);
+    int hsize = hspace * m_factor;
+    int vsize = vspace * m_factor;
 
     auto w = new QWidget();
-    w->setMinimumSize(size, size);
-    w->setMaximumSize(size, size);
+    w->setMinimumSize(hsize, vsize);
+    w->setMaximumSize(hsize, vsize);
     w->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     return w;
 }
diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
index 14d5a33e6f9..1cf66764a68 100644
--- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp
+++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp
@@ -85,7 +85,7 @@ ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) :
     m_ui.directoryButtonGroup->setId(m_ui.currentDirectoryRadioButton, UseCurrentDirectory);
     m_ui.directoryButtonGroup->setId(m_ui.directoryRadioButton, UseProjectDirectory);
 
-    connect(m_ui.directoryButtonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
+    connect(m_ui.directoryButtonGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
             this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged);
 }
 
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index fb2734db8ea..d269a059b38 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -509,7 +509,8 @@ public:
                 m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
             });
             targetDirLayout->addWidget(m_targetDirChooser);
-            connect(m_buttonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, [this] {
+            connect(m_buttonGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
+                    this, [this] {
                 switch (dropAction()) {
                 case DropAction::CopyWithFiles:
                 case DropAction::MoveWithFiles:
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index cc26ff54b1f..273f079feba 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -42,6 +42,8 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 
+#include <QRegularExpression>
+
 using namespace Utils;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
@@ -195,7 +197,7 @@ namespace {
 static QString generateSuffix(const QString &suffix)
 {
     QString result = suffix;
-    result.replace(QRegExp("[^a-zA-Z0-9_.-]"), QString('_')); // replace fishy character
+    result.replace(QRegularExpression("[^a-zA-Z0-9_.-]"), QString('_')); // replace fishy character
     if (!result.startsWith('.'))
         result.prepend('.');
     return result;
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
index d5f3def6512..ffe4f7cc43c 100644
--- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
+++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h
@@ -31,6 +31,10 @@
 
 #include <QProcessEnvironment>
 
+QT_BEGIN_NAMESPACE
+class QTextCodec;
+QT_END_NAMESPACE
+
 namespace Core { class IDocument; }
 namespace Utils { class FilePath; }
 
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
index 1cfd8d7b597..55fed6887e2 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
+++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
@@ -47,6 +47,8 @@
 #include <unistd.h>
 #include <sys/prctl.h>
 
+#include <utils/porting.h>
+
 // Enable compilation with older header that doesn't contain this constant
 // for running on newer libraries that do support it
 #ifndef PR_SET_PTRACER
@@ -101,7 +103,7 @@ CrashHandlerSetup::CrashHandlerSetup(const QString &appName,
         return;
     if (!QStringList{"1", "all", "yes"}.contains(value)) {
         const QString binaryName = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
-        if (!value.split(",", QString::SkipEmptyParts).contains(binaryName))
+        if (!value.split(",", Utils::SkipEmptyParts).contains(binaryName))
             return;
     }