Replace static_casts by QOverload where possible

Mainly to get rid of the QProcess::finished deprecation warning.

Also adjust coding style in the surrounding connects when needed.

Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp

@@ -87,8 +87,7 @@ void NodeInstanceClientProxy::initializeSocket()
 {
     QLocalSocket *localSocket = new QLocalSocket(this);
     connect(localSocket, &QIODevice::readyRead, this, &NodeInstanceClientProxy::readDataStream);
-    connect(localSocket,
+    connect(localSocket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
-            static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
             QCoreApplication::instance(), &QCoreApplication::quit);
     connect(localSocket, &QLocalSocket::disconnected, QCoreApplication::instance(), &QCoreApplication::quit);
     localSocket->connectToServer(QCoreApplication::arguments().at(1), QIODevice::ReadWrite | QIODevice::Unbuffered);

src/libs/clangsupport/connectionclient.cpp

@@ -325,7 +325,7 @@ void ConnectionClient::connectStandardOutputAndError(QProcess *process) const
 void ConnectionClient::connectLocalSocketError() const
 {
     connect(m_localSocket,
-            static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
+            QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
             this,
             &ConnectionClient::printLocalSocketError);
 }

src/libs/clangsupport/connectionserver.h

@@ -76,7 +76,7 @@ private:
     void connectToLocalServer(const QString &connectionName)
     {
         QObject::connect(&m_localSocket,
-                         static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
+                         QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
                          [&] (QLocalSocket::LocalSocketError) {
             qWarning() << "ConnectionServer error:" << m_localSocket.errorString() << connectionName;
         });

src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.cpp

@@ -352,7 +352,7 @@ void PropertiesView::MView::visitMElement(const MElement *element)
         m_stereotypeComboBox->addItems(m_propertiesView->stereotypeController()->knownStereotypes(m_stereotypeElement));
         connect(m_stereotypeComboBox->lineEdit(), &QLineEdit::textEdited,
                 this, &PropertiesView::MView::onStereotypesChanged);
-        connect(m_stereotypeComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
+        connect(m_stereotypeComboBox, QOverload<const QString &>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onStereotypesChanged);
     }
     if (!m_stereotypeComboBox->hasFocus()) {
@@ -580,7 +580,7 @@ void PropertiesView::MView::visitMDependency(const MDependency *dependency)
         m_directionSelector = new QComboBox(m_topWidget);
         m_directionSelector->addItems(QStringList({ "->", "<-", "<->" }));
         addRow(tr("Direction:"), m_directionSelector, "direction");
-        connect(m_directionSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_directionSelector, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onDependencyDirectionChanged);
     }
     if (isSingleSelection) {
@@ -664,7 +664,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endAKind = new QComboBox(m_topWidget);
         m_endAKind->addItems({ tr("Association"), tr("Aggregation"), tr("Composition") });
         addRow(tr("Relationship:"), m_endAKind, "relationship a");
-        connect(m_endAKind, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_endAKind, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onAssociationEndAKindChanged);
     }
     if (isSingleSelection) {
@@ -729,7 +729,7 @@ void PropertiesView::MView::visitMAssociation(const MAssociation *association)
         m_endBKind = new QComboBox(m_topWidget);
         m_endBKind->addItems({ tr("Association"), tr("Aggregation"), tr("Composition") });
         addRow(tr("Relationship:"), m_endBKind, "relationship b");
-        connect(m_endBKind, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_endBKind, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onAssociationEndBKindChanged);
     }
     if (isSingleSelection) {
@@ -930,7 +930,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
         m_visualSecondaryRoleSelector->addItems({ tr("Normal"), tr("Lighter"), tr("Darker"),
                                                   tr("Soften"), tr("Outline"), tr("Flat") });
         addRow(tr("Role:"), m_visualSecondaryRoleSelector, "role");
-        connect(m_visualSecondaryRoleSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_visualSecondaryRoleSelector, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onVisualSecondaryRoleChanged);
     }
     if (!m_visualSecondaryRoleSelector->hasFocus()) {
@@ -958,7 +958,7 @@ void PropertiesView::MView::visitDObject(const DObject *object)
         m_stereotypeDisplaySelector->addItems({ tr("Smart"), tr("None"), tr("Label"),
                                                 tr("Decoration"), tr("Icon") });
         addRow(tr("Stereotype display:"), m_stereotypeDisplaySelector, "stereotype display");
-        connect(m_stereotypeDisplaySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_stereotypeDisplaySelector, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onStereotypeDisplayChanged);
     }
     if (!m_stereotypeDisplaySelector->hasFocus()) {
@@ -995,7 +995,7 @@ void PropertiesView::MView::visitDClass(const DClass *klass)
         m_templateDisplaySelector = new QComboBox(m_topWidget);
         m_templateDisplaySelector->addItems({ tr("Smart"), tr("Box"), tr("Angle Brackets") });
         addRow(tr("Template display:"), m_templateDisplaySelector, "template display");
-        connect(m_templateDisplaySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_templateDisplaySelector, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onTemplateDisplayChanged);
     }
     if (!m_templateDisplaySelector->hasFocus()) {
@@ -1126,7 +1126,7 @@ void PropertiesView::MView::visitDAnnotation(const DAnnotation *annotation)
                                                                tr("Subtitle"), tr("Emphasized"),
                                                                tr("Soften"), tr("Footnote") }));
         addRow(tr("Role:"), m_annotationVisualRoleSelector, "visual role");
-        connect(m_annotationVisualRoleSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_annotationVisualRoleSelector, QOverload<int>::of(&QComboBox::activated),
                 this, &PropertiesView::MView::onAnnotationVisualRoleChanged);
     }
     if (!m_annotationVisualRoleSelector->hasFocus()) {

src/libs/qmldebug/qmldebugconnection.cpp

@@ -352,8 +352,8 @@ void QmlDebugConnection::connectToHost(const QString &hostName, quint16 port)
         emit logStateChange(socketStateToString(state));
     });
 
-    connect(socket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>
+    connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
-            (&QAbstractSocket::error), this, [this](QAbstractSocket::SocketError error) {
+            this, [this](QAbstractSocket::SocketError error) {
         emit logError(socketErrorToString(error));
         socketDisconnected();
     });
@@ -391,8 +391,8 @@ void QmlDebugConnection::newConnection()
 
     connect(socket, &QLocalSocket::disconnected, this, &QmlDebugConnection::socketDisconnected);
 
-    connect(socket, static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>
+    connect(socket, QOverload<QLocalSocket::LocalSocketError>::of(&QLocalSocket::error),
-            (&QLocalSocket::error), this, [this](QLocalSocket::LocalSocketError error) {
+            this, [this](QLocalSocket::LocalSocketError error) {
         emit logError(socketErrorToString(static_cast<QAbstractSocket::SocketError>(error)));
         socketDisconnected();
     });

src/libs/qmleditorwidgets/contextpanetextwidget.cpp

@@ -73,8 +73,7 @@ ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
     connect(parentContextWidget->colorDialog(), &CustomColorDialog::rejected,
             this, &ContextPaneTextWidget::onColorDialogCancled);
 
-    connect(ui->fontSizeSpinBox,
+    connect(ui->fontSizeSpinBox, QOverload<int>::of(&QmlEditorWidgets::FontSizeSpinBox::valueChanged),
-            static_cast<void (QmlEditorWidgets::FontSizeSpinBox::*)(int)>(&QmlEditorWidgets::FontSizeSpinBox::valueChanged),
             this, &ContextPaneTextWidget::onFontSizeChanged);
     connect(ui->fontSizeSpinBox, &QmlEditorWidgets::FontSizeSpinBox::formatChanged,
             this, &ContextPaneTextWidget::onFontFormatChanged);
@@ -104,7 +103,7 @@ ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
     connect(ui->bottomAlignmentButton, &QToolButton::toggled,
             this, &ContextPaneTextWidget::onVerticalAlignmentChanged);
 
-    connect(ui->styleComboBox, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+    connect(ui->styleComboBox, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
             this, &ContextPaneTextWidget::onStyleComboBoxChanged);
 }
 

src/libs/qmleditorwidgets/customcolordialog.cpp

@@ -113,17 +113,13 @@ CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent )
     resize(sizeHint());
 
     connect(m_colorBox, &ColorBox::colorChanged, this, &CustomColorDialog::onColorBoxChanged);
-    connect(m_alphaSpinBox,
+    connect(m_alphaSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
             this, &CustomColorDialog::spinBoxChanged);
-    connect(m_rSpinBox,
+    connect(m_rSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
             this, &CustomColorDialog::spinBoxChanged);
-    connect(m_gSpinBox,
+    connect(m_gSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
             this, &CustomColorDialog::spinBoxChanged);
-    connect(m_bSpinBox,
+    connect(m_bSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
-            static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
             this, &CustomColorDialog::spinBoxChanged);
     connect(m_hueControl, &HueControl::hueChanged, this, &CustomColorDialog::onHueChanged);
 

src/libs/ssh/sshremoteprocess.cpp

@@ -66,9 +66,7 @@ SshRemoteProcess::SshRemoteProcess(const QByteArray &command, const QStringList
     d->remoteCommand = command;
     d->connectionArgs = connectionArgs;
 
-    connect(this,
+    connect(this, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this] {
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
-            [this] {
         QString error;
         if (exitStatus() == QProcess::CrashExit)
             error = tr("The ssh binary crashed: %1").arg(errorString());

src/libs/utils/completingtextedit.cpp

@@ -114,7 +114,7 @@ void CompletingTextEdit::setCompleter(QCompleter *c)
 
     completer()->setWidget(this);
     completer()->setCompletionMode(QCompleter::PopupCompletion);
-    connect(completer(), static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated),
+    connect(completer(), QOverload<const QString &>::of(&QCompleter::activated),
             this, [this](const QString &str) { d->insertCompletion(str); });
 }
 

src/libs/utils/newclasswidget.cpp

@@ -88,7 +88,7 @@ NewClassWidget::NewClassWidget(QWidget *parent) :
     connect(d->m_ui.classLineEdit, &QLineEdit::textEdited,
             this, &NewClassWidget::classNameEdited);
     connect(d->m_ui.baseClassComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &NewClassWidget::suggestClassNameFromBase);
     connect(d->m_ui.baseClassComboBox, &QComboBox::editTextChanged,
             this, &NewClassWidget::slotValidChanged);

src/libs/utils/projectintropage.cpp

@@ -101,7 +101,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
     connect(d->m_ui.nameLineEdit, &FancyLineEdit::validReturnPressed,
             this, &ProjectIntroPage::slotActivated);
     connect(d->m_ui.projectComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ProjectIntroPage::slotChanged);
 
     setProperty(SHORT_TITLE_PROPERTY, tr("Location"));

src/libs/utils/settingsselector.cpp

@@ -73,7 +73,7 @@ SettingsSelector::SettingsSelector(QWidget *parent) :
     connect(m_renameButton, &QAbstractButton::clicked,
             this, &SettingsSelector::renameButtonClicked);
     connect(m_configurationCombo,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &SettingsSelector::currentChanged);
 }
 

src/libs/utils/synchronousprocess.cpp

@@ -297,8 +297,7 @@ SynchronousProcess::SynchronousProcess() :
 {
     d->m_timer.setInterval(1000);
     connect(&d->m_timer, &QTimer::timeout, this, &SynchronousProcess::slotTimeout);
-    connect(&d->m_process,
+    connect(&d->m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
             this, &SynchronousProcess::finished);
     connect(&d->m_process, &QProcess::errorOccurred, this, &SynchronousProcess::error);
     connect(&d->m_process, &QProcess::readyReadStandardOutput,

src/libs/utils/textfieldcombobox.cpp

@@ -43,7 +43,7 @@ TextFieldComboBox::TextFieldComboBox(QWidget *parent) :
     QComboBox(parent)
 {
     setEditable(false);
-    connect(this, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(this, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &TextFieldComboBox::slotCurrentIndexChanged);
 }
 

src/plugins/android/androidavdmanager.cpp

@@ -296,7 +296,7 @@ bool AndroidAvdManager::startAvdAsync(const QString &avdName) const
     auto avdProcess = new QProcess();
     avdProcess->setProcessChannelMode(QProcess::MergedChannels);
     QObject::connect(avdProcess,
-                     static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+                     QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                      avdProcess,
                      std::bind(&avdProcessFinished, std::placeholders::_1, avdProcess));
 

src/plugins/android/androidbuildapkwidget.cpp

@@ -100,7 +100,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
 
     // target sdk
     connect(m_ui->targetSDKComboBox,
-            static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
+            QOverload<const QString &>::of(&QComboBox::activated),
             this, &AndroidBuildApkInnerWidget::setTargetSdk);
 
     // deployment options
@@ -122,10 +122,10 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
     connect(m_ui->KeystoreLocationPathChooser, &Utils::PathChooser::pathChanged,
             this, &AndroidBuildApkInnerWidget::updateKeyStorePath);
     connect(m_ui->certificatesAliasComboBox,
-            static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
+            QOverload<const QString &>::of(&QComboBox::activated),
             this, &AndroidBuildApkInnerWidget::certificatesAliasComboBoxActivated);
     connect(m_ui->certificatesAliasComboBox,
-            static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+            QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
             this, &AndroidBuildApkInnerWidget::certificatesAliasComboBoxCurrentIndexChanged);
 
     connect(m_step->buildConfiguration(), &ProjectExplorer::BuildConfiguration::buildTypeChanged,

src/plugins/android/androidmanager.cpp

@@ -666,7 +666,7 @@ QProcess *AndroidManager::runAdbCommandDetached(const QStringList &args, QString
     p->start(adb, args);
     if (p->waitForStarted(500) && p->state() == QProcess::Running) {
         if (deleteOnFinish) {
-            connect(p.get(), static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+            connect(p.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                     p.get(), &QObject::deleteLater);
         }
         return p.release();

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -202,10 +202,10 @@ void AndroidManifestEditorWidget::initializePage()
         connect(m_versionNameLinedit, &QLineEdit::textEdited,
                 this, setDirtyFunc);
         connect(m_androidMinSdkVersion,
-                static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+                QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, setDirtyFunc);
         connect(m_androidTargetSdkVersion,
-                static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+                QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, setDirtyFunc);
 
     }

src/plugins/android/androidsignaloperation.cpp

@@ -63,8 +63,7 @@ void Android::Internal::AndroidSignalOperation::adbFindRunAsFinished(int exitCod
         m_state = Idle;
         emit finished(m_errorMessage);
     } else {
-        connect(m_adbProcess,
+        connect(m_adbProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-                static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
                 this, &AndroidSignalOperation::adbKillFinished);
         m_state = Kill;
         m_timeout->start();
@@ -113,8 +112,7 @@ void Android::Internal::AndroidSignalOperation::signalOperationViaADB(qint64 pid
     m_adbProcess->disconnect(this);
     m_pid = pid;
     m_signal = signal;
-    connect(m_adbProcess,
+    connect(m_adbProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
             this, &AndroidSignalOperation::adbFindRunAsFinished);
     m_state = RunAs;
     m_timeout->start();

src/plugins/android/avddialog.cpp

@@ -66,7 +66,7 @@ AvdDialog::AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QStri
     updateApiLevelComboBox();
 
     connect(m_avdDialog.abiComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AvdDialog::updateApiLevelComboBox);
 
     connect(&m_hideTipTimer, &QTimer::timeout,

src/plugins/android/createandroidmanifestwizard.cpp

@@ -95,7 +95,7 @@ ChooseProFilePage::ChooseProFilePage(CreateAndroidManifestWizard *wizard)
     }
 
     nodeSelected(m_comboBox->currentIndex());
-    connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ChooseProFilePage::nodeSelected);
 
     fl->addRow(tr(".pro file:"), m_comboBox);

src/plugins/autotest/gtest/gtestoutputreader.cpp

@@ -48,8 +48,7 @@ GTestOutputReader::GTestOutputReader(const QFutureInterface<TestResultPtr> &futu
     , m_projectFile(projectFile)
 {
     if (m_testApplication) {
-        connect(m_testApplication,
+        connect(m_testApplication, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-                static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
                 this, [this] (int exitCode, QProcess::ExitStatus /*exitStatus*/) {
             if (exitCode == 1 && !m_description.isEmpty()) {
                 createAndReportResult(tr("Running tests failed.\n %1\nExecutable: %2")

src/plugins/autotest/testrunner.cpp

@@ -217,8 +217,7 @@ void TestRunner::scheduleNext()
     }
     m_currentProcess->setProcessEnvironment(environment.toProcessEnvironment());
 
-    connect(m_currentProcess,
+    connect(m_currentProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-            static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
             this, &TestRunner::onProcessFinished);
     const int timeout = AutotestPlugin::settings()->timeout;
     QTimer::singleShot(timeout, m_currentProcess, [this]() { cancelCurrent(Timeout); });

src/plugins/baremetal/gdbserverprovider.cpp

@@ -258,7 +258,7 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget(
     connect(m_nameLineEdit, &QLineEdit::textChanged,
             this, &GdbServerProviderConfigWidget::dirty);
     connect(m_startupModeComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &GdbServerProviderConfigWidget::dirty);
 }
 
@@ -390,7 +390,7 @@ HostWidget::HostWidget(QWidget *parent)
 
     connect(m_hostLineEdit, &QLineEdit::textChanged,
             this, &HostWidget::dataChanged);
-    connect(m_portSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(m_portSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &HostWidget::dataChanged);
 }
 

src/plugins/baremetal/gdbserverproviderprocess.cpp

@@ -46,7 +46,7 @@ GdbServerProviderProcess::GdbServerProviderProcess(
         m_process->setUseCtrlCStub(true);
 
     connect(m_process, &QProcess::errorOccurred, this, &GdbServerProviderProcess::error);
-    connect(m_process, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &GdbServerProviderProcess::finished);
 
     connect(m_process, &QProcess::readyReadStandardOutput,

src/plugins/beautifier/configurationeditor.cpp

@@ -98,7 +98,7 @@ ConfigurationEditor::ConfigurationEditor(QWidget *parent) :
     m_completer->setCaseSensitivity(Qt::CaseInsensitive);
     m_completer->popup()->installEventFilter(this);
 
-    connect(m_completer, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated),
+    connect(m_completer, QOverload<const QString &>::of(&QCompleter::activated),
             this, &ConfigurationEditor::insertCompleterText);
     connect(this, &ConfigurationEditor::cursorPositionChanged,
             this, &ConfigurationEditor::updateDocumentation);

src/plugins/beautifier/configurationpanel.cpp

@@ -40,7 +40,7 @@ ConfigurationPanel::ConfigurationPanel(QWidget *parent) :
     connect(ui->add, &QPushButton::clicked, this, &ConfigurationPanel::add);
     connect(ui->edit, &QPushButton::clicked, this, &ConfigurationPanel::edit);
     connect(ui->remove, &QPushButton::clicked, this, &ConfigurationPanel::remove);
-    connect(ui->configurations, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(ui->configurations, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ConfigurationPanel::updateButtons);
 }
 

src/plugins/clangcodemodel/clangprojectsettingswidget.cpp

@@ -68,7 +68,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(ProjectExplorer::Project
     connect(m_ui.delayedTemplateParseCheckBox, &QCheckBox::toggled,
             this, &ClangProjectSettingsWidget::onDelayedTemplateParseClicked);
     connect(m_ui.globalOrCustomComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ClangProjectSettingsWidget::onGlobalCustomChanged);
     connect(project, &ProjectExplorer::Project::aboutToSaveSettings,
             this, &ClangProjectSettingsWidget::onAboutToSaveProjectSettings);

src/plugins/clangtools/clangselectablefilesdialog.cpp

@@ -316,7 +316,7 @@ SelectableFilesDialog::SelectableFilesDialog(const ProjectInfo &projectInfo,
     }
 
     connect(m_ui->globalOrCustom,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             [=](int index){
         m_ui->clangToolsBasicSettings->setEnabled(index == CustomSettings);
         if (index == CustomSettings) {

src/plugins/clangtools/clangtoolrunner.cpp

@@ -75,7 +75,7 @@ ClangToolRunner::ClangToolRunner(const QString &clangExecutable,
     m_process.setProcessEnvironment(environment.toProcessEnvironment());
     m_process.setWorkingDirectory(m_clangLogFileDir); // Current clang-cl puts log file into working dir.
     connect(&m_process, &QProcess::started, this, &ClangToolRunner::onProcessStarted);
-    connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &ClangToolRunner::onProcessFinished);
     connect(&m_process, &QProcess::errorOccurred, this, &ClangToolRunner::onProcessError);
     connect(&m_process, &QProcess::readyRead, this, &ClangToolRunner::onProcessOutput);

src/plugins/clangtools/clangtoolsconfigwidget.cpp

@@ -52,7 +52,7 @@ ClangToolsConfigWidget::ClangToolsConfigWidget(
     m_ui->simultaneousProccessesSpinBox->setMinimum(1);
     m_ui->simultaneousProccessesSpinBox->setMaximum(QThread::idealThreadCount());
     connect(m_ui->simultaneousProccessesSpinBox,
-            static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            QOverload<int>::of(&QSpinBox::valueChanged),
             [settings](int count) { settings->setSimultaneousProcesses(count); });
 
     QCheckBox *buildBeforeAnalysis = m_ui->clangToolsBasicSettings->ui()->buildBeforeAnalysis;

src/plugins/clearcase/activityselector.cpp

@@ -66,7 +66,7 @@ ActivitySelector::ActivitySelector(QWidget *parent) : QWidget(parent),
     connect(btnAdd, &QToolButton::clicked, this, &ActivitySelector::newActivity);
 
     refresh();
-    connect(m_cmbActivity, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_cmbActivity, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ActivitySelector::userChanged);
 }
 
@@ -103,10 +103,10 @@ void ActivitySelector::setActivity(const QString &act)
 {
     int index = m_cmbActivity->findData(act);
     if (index != -1) {
-        disconnect(m_cmbActivity, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        disconnect(m_cmbActivity, QOverload<int>::of(&QComboBox::currentIndexChanged),
                    this, &ActivitySelector::userChanged);
         m_cmbActivity->setCurrentIndex(index);
-        connect(m_cmbActivity, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        connect(m_cmbActivity, QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, &ActivitySelector::userChanged);
     }
 }

src/plugins/coreplugin/dialogs/newdialog.cpp

@@ -231,7 +231,7 @@ NewDialog::NewDialog(QWidget *parent) :
     connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &NewDialog::reject);
 
     connect(m_ui->comboBox,
-            static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+            QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
             this, &NewDialog::setSelectedPlatform);
 }
 

src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp

@@ -449,8 +449,8 @@ void ReadOnlyFilesDialogPrivate::initDialog(const QStringList &fileNames)
         groupForFile.fileName = fileName;
         groupForFile.group = radioButtonGroup;
         buttonGroups.append(groupForFile);
-        QObject::connect(radioButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
+        QObject::connect(radioButtonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
-                [this](int) { updateSelectAll(); });
+                         [this] { updateSelectAll(); });
     }
 
     // Apply the Mac file dialog style.
@@ -508,7 +508,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const QStringList &fileNames)
         ui.setAll->addItem(saveAsText);
         setAllIndexForOperation[SaveAs] = ui.setAll->count() - 1;
     }
-    QObject::connect(ui.setAll, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    QObject::connect(ui.setAll, QOverload<int>::of(&QComboBox::activated),
                      [this](int index) { setAll(index); });
 
     // Filter which columns should be visible and resize them to content.

src/plugins/coreplugin/editortoolbar.cpp

@@ -190,7 +190,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
 
     // this signal is disconnected for standalone toolbars and replaced with
     // a private slot connection
-    connect(d->m_editorList, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(d->m_editorList, QOverload<int>::of(&QComboBox::activated),
             this, &EditorToolBar::listSelectionActivated);
 
     connect(d->m_editorList, &QComboBox::customContextMenuRequested, [this](QPoint p) {
@@ -303,9 +303,9 @@ void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags)
         connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
                 this, &EditorToolBar::updateEditorListSelection);
 
-        disconnect(d->m_editorList, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        disconnect(d->m_editorList, QOverload<int>::of(&QComboBox::activated),
                    this, &EditorToolBar::listSelectionActivated);
-        connect(d->m_editorList, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(d->m_editorList, QOverload<int>::of(&QComboBox::activated),
                 this, &EditorToolBar::changeActiveEditor);
         d->m_splitButton->setVisible(false);
         d->m_closeSplitButton->setVisible(false);

src/plugins/coreplugin/externaltool.cpp

@@ -654,7 +654,7 @@ void ExternalToolRunner::run()
     }
     m_process = new QtcProcess(this);
     connect(m_process, &QProcess::started, this, &ExternalToolRunner::started);
-    connect(m_process, static_cast<void (QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &ExternalToolRunner::finished);
     connect(m_process, &QProcess::errorOccurred, this, &ExternalToolRunner::error);
     connect(m_process, &QProcess::readyReadStandardOutput,

src/plugins/coreplugin/find/findtoolbar.cpp

@@ -118,8 +118,7 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
             this, &FindToolBar::invokeFindEnter, Qt::QueuedConnection);
     connect(m_ui.replaceEdit, &Utils::FancyLineEdit::returnPressed,
             this, &FindToolBar::invokeReplaceEnter, Qt::QueuedConnection);
-    connect(m_findCompleter,
+    connect(m_findCompleter, QOverload<const QModelIndex &>::of(&QCompleter::activated),
-            static_cast<void (QCompleter::*)(const QModelIndex &)>(&QCompleter::activated),
             this, &FindToolBar::findCompleterActivated);
 
     auto shiftEnterAction = new QAction(m_ui.findEdit);

src/plugins/coreplugin/find/findtoolwindow.cpp

@@ -77,14 +77,13 @@ FindToolWindow::FindToolWindow(QWidget *parent)
     connect(m_ui.matchCase, &QAbstractButton::toggled, Find::instance(), &Find::setCaseSensitive);
     connect(m_ui.wholeWords, &QAbstractButton::toggled, Find::instance(), &Find::setWholeWord);
     connect(m_ui.regExp, &QAbstractButton::toggled, Find::instance(), &Find::setRegularExpression);
-    connect(m_ui.filterList, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_ui.filterList, QOverload<int>::of(&QComboBox::activated),
-            this, static_cast<void (FindToolWindow::*)(int)>(&FindToolWindow::setCurrentFilter));
+            this, QOverload<int>::of(&FindToolWindow::setCurrentFilter));
 
     m_findCompleter->setModel(Find::findCompletionModel());
     m_ui.searchTerm->setSpecialCompleter(m_findCompleter);
     m_ui.searchTerm->installEventFilter(this);
-    connect(m_findCompleter,
+    connect(m_findCompleter, QOverload<const QModelIndex &>::of(&QCompleter::activated),
-            static_cast<void (QCompleter::*)(const QModelIndex &)>(&QCompleter::activated),
             this, &FindToolWindow::findCompleterActivated);
 
     m_ui.searchTerm->setValidationFunction(validateRegExp);

src/plugins/coreplugin/find/highlightscrollbarcontroller.cpp

@@ -92,7 +92,7 @@ void HighlightScrollBarOverlay::scheduleUpdate()
         return;
 
     m_isCacheUpdateScheduled = true;
-    QTimer::singleShot(0, this, static_cast<void (QWidget::*)()>(&QWidget::update));
+    QTimer::singleShot(0, this, QOverload<>::of(&QWidget::update));
 }
 
 void HighlightScrollBarOverlay::paintEvent(QPaintEvent *paintEvent)

src/plugins/coreplugin/find/searchresultwindow.cpp

@@ -124,7 +124,7 @@ namespace Internal {
         m_recentSearchesBox->setProperty("drawleftborder", true);
         m_recentSearchesBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         m_recentSearchesBox->addItem(tr("New Search"));
-        connect(m_recentSearchesBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_recentSearchesBox, QOverload<int>::of(&QComboBox::activated),
                 this, &SearchResultWindowPrivate::setCurrentIndexWithFocus);
 
         m_widget->setWindowTitle(q->displayName());

src/plugins/coreplugin/locator/executefilter.cpp

@@ -44,7 +44,7 @@ ExecuteFilter::ExecuteFilter()
 
     m_process = new Utils::QtcProcess(this);
     m_process->setEnvironment(Utils::Environment::systemEnvironment());
-    connect(m_process, static_cast<void (QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+    connect(m_process, QOverload<int ,QProcess::ExitStatus>::of(&QProcess::finished),
             this, &ExecuteFilter::finished);
     connect(m_process, &QProcess::readyReadStandardOutput, this, &ExecuteFilter::readStandardOutput);
     connect(m_process, &QProcess::readyReadStandardError, this, &ExecuteFilter::readStandardError);

src/plugins/coreplugin/mimetypemagicdialog.cpp

@@ -55,7 +55,7 @@ MimeTypeMagicDialog::MimeTypeMagicDialog(QWidget *parent) :
     connect(ui.informationLabel, &QLabel::linkActivated, this, [](const QString &link) {
         QDesktopServices::openUrl(QUrl(link));
     });
-    connect(ui.typeSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(ui.typeSelector, QOverload<int>::of(&QComboBox::activated),
             this, [this]() {
         if (ui.useRecommendedGroupBox->isChecked())
             setToRecommendedValues();

src/plugins/coreplugin/navigationsubwidget.cpp

@@ -97,7 +97,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     setFactoryIndex(factoryIndex);
 
     connect(m_navigationComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &NavigationSubWidget::comboBoxIndexChanged);
 
     comboBoxIndexChanged(factoryIndex);

src/plugins/coreplugin/outputpanemanager.cpp

@@ -636,7 +636,7 @@ OutputPaneToggleButton::OutputPaneToggleButton(int number, const QString &text,
     m_flashTimer->setDirection(QTimeLine::Forward);
     m_flashTimer->setCurveShape(QTimeLine::SineCurve);
     m_flashTimer->setFrameRange(0, 92);
-    auto updateSlot = static_cast<void (QWidget::*)()>(&QWidget::update);
+    auto updateSlot = QOverload<>::of(&QWidget::update);
     connect(m_flashTimer, &QTimeLine::valueChanged, this, updateSlot);
     connect(m_flashTimer, &QTimeLine::finished, this, updateSlot);
     updateToolTip();

src/plugins/coreplugin/sidebarwidget.cpp

@@ -99,7 +99,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id)
     }
     setCurrentItem(t);
 
-    connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &SideBarWidget::setCurrentIndex);
 }
 

src/plugins/cpaster/pasteselectdialog.cpp

@@ -44,7 +44,7 @@ PasteSelectDialog::PasteSelectDialog(const QList<Protocol*> &protocols,
         m_ui.protocolBox->addItem(protocol->name());
         connect(protocol, &Protocol::listDone, this, &PasteSelectDialog::listDone);
     }
-    connect(m_ui.protocolBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui.protocolBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &PasteSelectDialog::protocolChanged);
 
     m_refreshButton = m_ui.buttons->addButton(tr("Refresh"), QDialogButtonBox::ActionRole);

src/plugins/cpaster/pasteview.cpp

@@ -53,7 +53,7 @@ PasteView::PasteView(const QList<Protocol *> &protocols,
 
     foreach (const Protocol *p, protocols)
         m_ui.protocolBox->addItem(p->name());
-    connect(m_ui.protocolBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui.protocolBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &PasteView::protocolChanged);
 }
 

src/plugins/cppeditor/cppcodemodelinspectordialog.cpp

@@ -1389,7 +1389,7 @@ CppCodeModelInspectorDialog::CppCodeModelInspectorDialog(QWidget *parent)
     connect(m_snapshotView, &FilterableView::filterChanged,
             this, &CppCodeModelInspectorDialog::onSnapshotFilterChanged);
     connect(m_ui->snapshotSelector,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &CppCodeModelInspectorDialog::onSnapshotSelected);
     connect(m_ui->docSymbolsView, &QTreeView::expanded,
             this, &CppCodeModelInspectorDialog::onSymbolsViewExpandedOrCollapsed);

src/plugins/cppeditor/cppparsecontext.cpp

@@ -149,7 +149,7 @@ ParseContextWidget::ParseContextWidget(ParseContextModel &parseContextModel, QWi
 
     // Set up sync of this widget and model in both directions
     connect(this,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+            QOverload<int>::of(&QComboBox::activated),
             &m_parseContextModel,
             &ParseContextModel::setPreferred);
     connect(&m_parseContextModel, &ParseContextModel::updated,

src/plugins/cpptools/clangdiagnosticconfigswidget.cpp

@@ -910,7 +910,7 @@ void ClangDiagnosticConfigsWidget::updateValidityWidgets(const QString &errorMes
 void ClangDiagnosticConfigsWidget::connectClangTidyItemChanged()
 {
     connect(m_tidyChecks->tidyMode,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
             &ClangDiagnosticConfigsWidget::onClangTidyModeChanged);
     connect(m_tidyTreeModel.get(), &TidyChecksTreeModel::dataChanged,
@@ -920,7 +920,7 @@ void ClangDiagnosticConfigsWidget::connectClangTidyItemChanged()
 void ClangDiagnosticConfigsWidget::disconnectClangTidyItemChanged()
 {
     disconnect(m_tidyChecks->tidyMode,
-               static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+               QOverload<int>::of(&QComboBox::currentIndexChanged),
                this,
                &ClangDiagnosticConfigsWidget::onClangTidyModeChanged);
     disconnect(m_tidyTreeModel.get(), &TidyChecksTreeModel::dataChanged,

src/plugins/cpptools/cppeditoroutline.cpp

@@ -124,9 +124,9 @@ CppEditorOutline::CppEditorOutline(TextEditor::TextEditorWidget *editorWidget)
             &CppTools::CppToolsSettings::setSortedEditorDocumentOutline);
     m_combo->addAction(m_sortAction);
 
-    connect(m_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_combo, QOverload<int>::of(&QComboBox::activated),
             this, &CppEditorOutline::gotoSymbolInEditor);
-    connect(m_combo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_combo, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &CppEditorOutline::updateToolTip);
 
     // Set up timers

src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp

@@ -52,7 +52,7 @@ AnalyzerRunConfigWidget::AnalyzerRunConfigWidget(ProjectExplorer::GlobalOrProjec
             QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Custom")
             }));
     globalSettingLayout->addWidget(m_settingsCombo);
-    connect(m_settingsCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_settingsCombo, QOverload<int>::of(&QComboBox::activated),
             this, &AnalyzerRunConfigWidget::chooseSettings);
     m_restoreButton = new QPushButton(
                 QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Restore Global"),

src/plugins/debugger/debuggerkitinformation.cpp

@@ -68,7 +68,7 @@ public:
 
         refresh();
         m_comboBox->setToolTip(ki->description());
-        connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, &DebuggerKitAspectWidget::currentDebuggerChanged);
 
         m_manageButton = new QPushButton(KitAspectWidget::msgManage());

src/plugins/debugger/debuggermainwindow.cpp

@@ -144,7 +144,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     m_perspectiveChooser->setObjectName("PerspectiveChooser");
     m_perspectiveChooser->setProperty("panelwidget", true);
     m_perspectiveChooser->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    connect(m_perspectiveChooser, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_perspectiveChooser, QOverload<int>::of(&QComboBox::activated),
             this, [this](int item) {
         Perspective *perspective = Perspective::findPerspective(m_perspectiveChooser->itemData(item).toString());
         QTC_ASSERT(perspective, return);

src/plugins/debugger/gdb/gdbengine.cpp

@@ -133,7 +133,7 @@ GdbEngine::GdbEngine()
 
     connect(&m_gdbProc, &QProcess::errorOccurred,
             this, &GdbEngine::handleGdbError);
-    connect(&m_gdbProc,  static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_gdbProc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &GdbEngine::handleGdbFinished);
     connect(&m_gdbProc, &QtcProcess::readyReadStandardOutput,
             this, &GdbEngine::readGdbStandardOutput);

src/plugins/debugger/lldb/lldbengine.cpp

@@ -100,7 +100,7 @@ LldbEngine::LldbEngine()
 
     connect(&m_lldbProc, &QProcess::errorOccurred,
             this, &LldbEngine::handleLldbError);
-    connect(&m_lldbProc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_lldbProc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &LldbEngine::handleLldbFinished);
     connect(&m_lldbProc, &QProcess::readyReadStandardOutput,
             this, &LldbEngine::readLldbStandardOutput);

src/plugins/designer/qtcreatorintegration.cpp

@@ -86,8 +86,7 @@ QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, Q
     f &= ~ResourceEditorFeature;
     setFeatures(f);
 
-    connect(this, static_cast<void (QDesignerIntegrationInterface::*)
+    connect(this, QOverload<const QString &, const QString &, const QStringList &>::of
-                    (const QString&, const QString&, const QStringList&)>
                        (&QDesignerIntegrationInterface::navigateToSlot),
             this, &QtCreatorIntegration::slotNavigateToSlot);
     connect(this, &QtCreatorIntegration::helpRequested,

src/plugins/diffeditor/diffeditor.cpp

@@ -179,7 +179,7 @@ DiffEditor::DiffEditor()
     QSizePolicy policy = m_entriesComboBox->sizePolicy();
     policy.setHorizontalPolicy(QSizePolicy::Expanding);
     m_entriesComboBox->setSizePolicy(policy);
-    connect(m_entriesComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_entriesComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &DiffEditor::setCurrentDiffFileIndex);
     m_toolBar->addWidget(m_entriesComboBox);
 
@@ -209,7 +209,7 @@ DiffEditor::DiffEditor()
     m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());
 
     connect(m_whitespaceButtonAction, &QAction::toggled, this, &DiffEditor::ignoreWhitespaceHasChanged);
-    connect(m_contextSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(m_contextSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &DiffEditor::contextLineCountHasChanged);
     connect(m_toggleSyncAction, &QAction::toggled, this, &DiffEditor::toggleSync);
     connect(m_toggleDescriptionAction, &QAction::toggled, this, &DiffEditor::toggleDescription);

src/plugins/git/gerrit/gerritmodel.cpp

@@ -284,7 +284,7 @@ QueryContext::QueryContext(const QString &query,
     connect(&m_process, &QProcess::readyReadStandardOutput, this, [this] {
         m_output.append(m_process.readAllStandardOutput());
     });
-    connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &QueryContext::processFinished);
     connect(&m_process, &QProcess::errorOccurred, this, &QueryContext::processError);
     connect(&m_watcher, &QFutureWatcherBase::canceled, this, &QueryContext::terminate);
@@ -376,7 +376,7 @@ void QueryContext::timeout()
                     arg(timeOutMS / 1000), QMessageBox::NoButton, parent);
     QPushButton *terminateButton = box.addButton(tr("Terminate"), QMessageBox::YesRole);
     box.addButton(tr("Keep Running"), QMessageBox::NoRole);
-    connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             &box, &QDialog::reject);
     box.exec();
     if (m_process.state() != QProcess::Running)

src/plugins/git/gerrit/gerritplugin.cpp

@@ -140,7 +140,7 @@ FetchContext::FetchContext(const QSharedPointer<GerritChange> &change,
     , m_state(FetchState)
 {
     connect(&m_process, &QProcess::errorOccurred, this, &FetchContext::processError);
-    connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &FetchContext::processFinished);
     connect(&m_process, &QProcess::readyReadStandardError,
             this, &FetchContext::processReadyReadStandardError);

src/plugins/git/gerrit/gerritpushdialog.cpp

@@ -146,10 +146,10 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev
     }
 
     m_ui->localBranchComboBox->init(workingDir);
-    connect(m_ui->localBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui->localBranchComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &GerritPushDialog::updateCommits);
 
-    connect(m_ui->targetBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui->targetBranchComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &GerritPushDialog::setChangeRange);
 
     connect(m_ui->targetBranchComboBox, &QComboBox::currentTextChanged,

src/plugins/help/helpwidget.cpp

@@ -220,7 +220,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
         m_filterComboBox->setModel(LocalHelpManager::filterModel());
         m_filterComboBox->setCurrentIndex(LocalHelpManager::filterIndex());
         layout->addWidget(m_filterComboBox);
-        connect(m_filterComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+        connect(m_filterComboBox, QOverload<int>::of(&QComboBox::activated),
                 LocalHelpManager::instance(), &LocalHelpManager::setFilterIndex);
         connect(LocalHelpManager::instance(), &LocalHelpManager::filterIndexChanged,
                 m_filterComboBox, &QComboBox::setCurrentIndex);

src/plugins/help/openpagesmanager.cpp

@@ -61,7 +61,7 @@ OpenPagesManager::OpenPagesManager(QObject *parent)
     m_comboBox = new QComboBox;
     m_comboBox->setModel(m_model);
     m_comboBox->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_comboBox, QOverload<int>::of(&QComboBox::activated),
             this, &OpenPagesManager::setCurrentPageByRow);
     connect(m_comboBox, &QWidget::customContextMenuRequested, this,
         &OpenPagesManager::openPagesContextMenu);

src/plugins/ios/iostoolhandler.cpp

@@ -676,7 +676,7 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de
     QObject::connect(process.get(), &QProcess::readyReadStandardOutput,
                      std::bind(&IosDeviceToolHandlerPrivate::subprocessHasData,this));
 
-    QObject::connect(process.get(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    QObject::connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                      std::bind(&IosDeviceToolHandlerPrivate::subprocessFinished,this, _1,_2));
 
     QObject::connect(process.get(), &QProcess::errorOccurred,

src/plugins/modeleditor/modeleditor.cpp

@@ -321,7 +321,7 @@ void ModelEditor::init(QWidget *parent)
     toolbarLayout->addWidget(openParentButton);
 
     d->diagramSelector = new QComboBox(d->toolbar);
-    connect(d->diagramSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(d->diagramSelector, QOverload<int>::of(&QComboBox::activated),
             this, &ModelEditor::onDiagramSelectorSelected);
     toolbarLayout->addWidget(d->diagramSelector, 1);
     toolbarLayout->addStretch(1);

src/plugins/perforce/perforcechecker.cpp

@@ -42,7 +42,7 @@ namespace Internal {
 PerforceChecker::PerforceChecker(QObject *parent) : QObject(parent)
 {
     connect(&m_process, &QProcess::errorOccurred, this, &PerforceChecker::slotError);
-    connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &PerforceChecker::slotFinished);
 }
 

src/plugins/perfprofiler/perfconfigwidget.cpp

@@ -83,7 +83,7 @@ PerfConfigWidget::PerfConfigWidget(PerfSettings *settings, QWidget *parent) :
         m_ui->stackSize->setEnabled(mode == QLatin1String(Constants::PerfCallgraphDwarf));
     });
 
-    auto spinBoxChangedSignal = static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged);
+    auto spinBoxChangedSignal = QOverload<int>::of(&QSpinBox::valueChanged);
     connect(m_ui->stackSize, spinBoxChangedSignal, m_settings, &PerfSettings::setStackSize);
     connect(m_ui->period, spinBoxChangedSignal, m_settings, &PerfSettings::setPeriod);
     connect(m_ui->sampleMode, comboboxChangedSignal, this, [this](int index) {

src/plugins/perfprofiler/perfdatareader.cpp

@@ -64,7 +64,7 @@ PerfDataReader::PerfDataReader(QObject *parent) :
     m_remoteProcessStart(std::numeric_limits<qint64>::max()),
     m_lastRemoteTimestamp(0)
 {
-    connect(&m_input, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
+    connect(&m_input, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, [this](int exitCode) {
         emit processFinished();
         // process any remaining input before signaling finished()

src/plugins/projectexplorer/abiwidget.cpp

@@ -85,7 +85,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     d->m_abi->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
     d->m_abi->setMinimumContentsLength(4);
     layout->addWidget(d->m_abi);
-    connect(d->m_abi, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_abi, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::mainComboBoxChanged);
 
     d->m_architectureComboBox = new QComboBox(this);
@@ -93,7 +93,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     for (int i = 0; i <= static_cast<int>(Abi::UnknownArchitecture); ++i)
         d->m_architectureComboBox->addItem(Abi::toString(static_cast<Abi::Architecture>(i)), i);
     d->m_architectureComboBox->setCurrentIndex(static_cast<int>(Abi::UnknownArchitecture));
-    connect(d->m_architectureComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_architectureComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::customComboBoxesChanged);
 
     QLabel *separator1 = new QLabel(this);
@@ -106,7 +106,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     for (int i = 0; i <= static_cast<int>(Abi::UnknownOS); ++i)
         d->m_osComboBox->addItem(Abi::toString(static_cast<Abi::OS>(i)), i);
     d->m_osComboBox->setCurrentIndex(static_cast<int>(Abi::UnknownOS));
-    connect(d->m_osComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_osComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::customOsComboBoxChanged);
 
     QLabel *separator2 = new QLabel(this);
@@ -116,7 +116,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
 
     d->m_osFlavorComboBox = new QComboBox(this);
     layout->addWidget(d->m_osFlavorComboBox);
-    connect(d->m_osFlavorComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_osFlavorComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::customComboBoxesChanged);
 
     QLabel *separator3 = new QLabel(this);
@@ -129,7 +129,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     for (int i = 0; i <= static_cast<int>(Abi::UnknownFormat); ++i)
         d->m_binaryFormatComboBox->addItem(Abi::toString(static_cast<Abi::BinaryFormat>(i)), i);
     d->m_binaryFormatComboBox->setCurrentIndex(static_cast<int>(Abi::UnknownFormat));
-    connect(d->m_binaryFormatComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_binaryFormatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::customComboBoxesChanged);
 
     QLabel *separator4 = new QLabel(this);
@@ -144,7 +144,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     d->m_wordWidthComboBox->addItem(Abi::toString(64), 64);
     d->m_wordWidthComboBox->addItem(Abi::toString(0), 0);
     d->m_wordWidthComboBox->setCurrentIndex(2);
-    connect(d->m_wordWidthComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(d->m_wordWidthComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &AbiWidget::customComboBoxesChanged);
 
     layout->setStretchFactor(d->m_abi, 1);

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -237,7 +237,7 @@ void AbstractProcessStep::doRun()
             this, &AbstractProcessStep::processReadyReadStdOutput);
     connect(d->m_process.get(), &QProcess::readyReadStandardError,
             this, &AbstractProcessStep::processReadyReadStdError);
-    connect(d->m_process.get(), static_cast<void (QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+    connect(d->m_process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &AbstractProcessStep::slotProcessFinished);
 
     d->m_process->start();

src/plugins/projectexplorer/applicationlauncher.cpp

@@ -137,7 +137,7 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare
             this, &ApplicationLauncherPrivate::readLocalStandardOutput);
     connect(&m_guiProcess, &QProcess::errorOccurred,
             this, &ApplicationLauncherPrivate::localGuiProcessError);
-    connect(&m_guiProcess, static_cast<void (QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
+    connect(&m_guiProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &ApplicationLauncherPrivate::localProcessDone);
     connect(&m_guiProcess, &QProcess::started,
             this, &ApplicationLauncherPrivate::handleProcessStarted);
@@ -152,8 +152,7 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare
             this, &ApplicationLauncherPrivate::localConsoleProcessError);
     connect(&m_consoleProcess, &ConsoleProcess::processStopped,
             this, &ApplicationLauncherPrivate::localProcessDone);
-    connect(&m_consoleProcess,
+    connect(&m_consoleProcess, QOverload<QProcess::ProcessError>::of(&ConsoleProcess::error),
-            static_cast<void (ConsoleProcess::*)(QProcess::ProcessError)>(&ConsoleProcess::error),
             q, &ApplicationLauncher::error);
 
 #ifdef Q_OS_WIN

src/plugins/projectexplorer/buildsettingspropertiespage.cpp

@@ -119,7 +119,7 @@ BuildSettingsWidget::BuildSettingsWidget(Target *target) :
     updateAddButtonMenu();
     updateBuildSettings();
 
-    connect(m_buildConfigurationComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_buildConfigurationComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &BuildSettingsWidget::currentIndexChanged);
 
     connect(m_removeButton, &QAbstractButton::clicked,

src/plugins/projectexplorer/codestylesettingspropertiespage.cpp

@@ -56,7 +56,7 @@ CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project) : QWidget(),
         m_ui.languageComboBox->addItem(factory->displayName());
     }
 
-    connect(m_ui.languageComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui.languageComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             m_ui.stackedWidget, &QStackedWidget::setCurrentIndex);
 }
 

src/plugins/projectexplorer/customparserconfigdialog.cpp

@@ -42,20 +42,20 @@ CustomParserConfigDialog::CustomParserConfigDialog(QDialog *parent) :
     connect(ui->errorPattern, &QLineEdit::textChanged, this, &CustomParserConfigDialog::changed);
     connect(ui->errorOutputMessage, &QLineEdit::textChanged,
             this, &CustomParserConfigDialog::changed);
-    connect(ui->errorFileNameCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->errorFileNameCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
-    connect(ui->errorLineNumberCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->errorLineNumberCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
-    connect(ui->errorMessageCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->errorMessageCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
     connect(ui->warningPattern, &QLineEdit::textChanged, this, &CustomParserConfigDialog::changed);
     connect(ui->warningOutputMessage, &QLineEdit::textChanged,
             this, &CustomParserConfigDialog::changed);
-    connect(ui->warningFileNameCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->warningFileNameCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
-    connect(ui->warningLineNumberCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->warningLineNumberCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
-    connect(ui->warningMessageCap, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(ui->warningMessageCap, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &CustomParserConfigDialog::changed);
 
     changed();

src/plugins/projectexplorer/customtoolchain.cpp

@@ -566,7 +566,7 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) :
             this, &CustomToolChainConfigWidget::updateSummaries);
     connect(m_cxx11Flags, &QLineEdit::textChanged, this, &ToolChainConfigWidget::dirty);
     connect(m_mkspecs, &QLineEdit::textChanged, this, &ToolChainConfigWidget::dirty);
-    connect(m_errorParserComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_errorParserComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &CustomToolChainConfigWidget::errorParserChanged);
     connect(m_customParserSettingsButton, &QAbstractButton::clicked,
             this, &CustomToolChainConfigWidget::openCustomParserSettingsDialog);

src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp

@@ -185,13 +185,9 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser,
 
     proxyModel.setFilterRegExp(processFilterLineEdit->text());
 
-    connect(processFilterLineEdit,
+    connect(processFilterLineEdit, QOverload<const QString &>::of(&FancyLineEdit::textChanged),
-            static_cast<void (FancyLineEdit::*)(const QString &)>(&FancyLineEdit::textChanged),
+            &proxyModel, QOverload<const QString &>::of(&ProcessListFilterModel::setFilterRegExp));
-            &proxyModel,
+    connect(procView->selectionModel(), &QItemSelectionModel::selectionChanged,
-            static_cast<void (ProcessListFilterModel::*)(const QString &)>(
-                &ProcessListFilterModel::setFilterRegExp));
-    connect(procView->selectionModel(),
-        &QItemSelectionModel::selectionChanged,
             this, &DeviceProcessesDialogPrivate::updateButtons);
     connect(updateListButton, &QAbstractButton::clicked,
             this, &DeviceProcessesDialogPrivate::updateProcessList);

src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp

@@ -122,7 +122,7 @@ void DeviceSettingsWidget::initGui()
         lastIndex = 0;
     if (lastIndex < m_ui->configurationComboBox->count())
         m_ui->configurationComboBox->setCurrentIndex(lastIndex);
-    connect(m_ui->configurationComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui->configurationComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &DeviceSettingsWidget::currentDeviceChanged);
     currentDeviceChanged(currentIndex());
     connect(m_ui->defaultDeviceButton, &QAbstractButton::clicked,

src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp

@@ -195,8 +195,7 @@ void SshDeviceProcess::handleConnected()
     if (runInTerminal()) {
         d->process->requestTerminal();
         const QStringList cmdLine = d->process->fullLocalCommandLine();
-        connect(&d->consoleProcess,
+        connect(&d->consoleProcess, QOverload<QProcess::ProcessError>::of(&ConsoleProcess::error),
-                static_cast<void (ConsoleProcess::*)(QProcess::ProcessError)>(&ConsoleProcess::error),
                 this, &DeviceProcess::error);
         connect(&d->consoleProcess, &ConsoleProcess::processStarted,
                 this, &SshDeviceProcess::handleProcessStarted);

src/plugins/projectexplorer/editorsettingspropertiespage.cpp

@@ -43,14 +43,14 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project) : QWidget(), m_proj
     globalSettingsActivated(config->useGlobalSettings() ? 0 : 1);
 
 
-    connect(m_ui.globalSelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_ui.globalSelector, QOverload<int>::of(&QComboBox::activated),
             this, &EditorSettingsWidget::globalSettingsActivated);
     connect(m_ui.restoreButton, &QAbstractButton::clicked,
             this, &EditorSettingsWidget::restoreDefaultValues);
 
     connect(m_ui.showWrapColumn, &QAbstractButton::toggled,
             config, &EditorConfiguration::setShowWrapColumn);
-    connect(m_ui.wrapColumn, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(m_ui.wrapColumn, QOverload<int>::of(&QSpinBox::valueChanged),
             config, &EditorConfiguration::setWrapColumn);
 
     connect(m_ui.behaviorSettingsWidget, &TextEditor::BehaviorSettingsWidget::typingSettingsChanged,

src/plugins/projectexplorer/environmentaspectwidget.cpp

@@ -71,7 +71,7 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect, QWid
     if (m_baseEnvironmentComboBox->count() == 1)
         m_baseEnvironmentComboBox->setEnabled(false);
 
-    connect(m_baseEnvironmentComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_baseEnvironmentComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &EnvironmentAspectWidget::baseEnvironmentSelected);
 
     baseLayout->addWidget(m_baseEnvironmentComboBox);

src/plugins/projectexplorer/foldernavigationwidget.cpp

@@ -418,7 +418,7 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent
     connect(m_toggleRootSync, &QAbstractButton::clicked,
             this, [this]() { setRootAutoSynchronization(!m_rootAutoSync); });
     connect(m_rootSelector,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
             [this](int index) {
                 const auto directory = m_rootSelector->itemData(index).value<Utils::FileName>();

src/plugins/projectexplorer/kitchooser.cpp

@@ -59,9 +59,9 @@ KitChooser::KitChooser(QWidget *parent) :
     layout->addWidget(m_manageButton);
     setFocusProxy(m_manageButton);
 
-    connect(m_chooser, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_chooser, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &KitChooser::onCurrentIndexChanged);
-    connect(m_chooser, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+    connect(m_chooser, QOverload<int>::of(&QComboBox::activated),
             this, &KitChooser::onActivated);
     connect(m_manageButton, &QAbstractButton::clicked, this, &KitChooser::onManageButtonClicked);
     connect(KitManager::instance(), &KitManager::kitsChanged, this, &KitChooser::populate);

src/plugins/projectexplorer/kitinformation.cpp

@@ -249,7 +249,7 @@ public:
             layout->addWidget(cb, row, 1);
             ++row;
 
-            connect(cb, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            connect(cb, QOverload<int>::of(&QComboBox::currentIndexChanged),
                     this, [this, l](int idx) { currentToolChainChanged(l, idx); });
         }
 
@@ -770,7 +770,7 @@ public:
             m_comboBox->addItem(factory->displayName(), factory->deviceType().toSetting());
         m_comboBox->setToolTip(ki->description());
         refresh();
-        connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, &DeviceTypeKitAspectWidget::currentTypeChanged);
     }
 
@@ -895,7 +895,7 @@ public:
                 this, &DeviceKitAspectWidget::modelAboutToReset);
         connect(m_model, &QAbstractItemModel::modelReset,
                 this, &DeviceKitAspectWidget::modelReset);
-        connect(m_comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
                 this, &DeviceKitAspectWidget::currentDeviceChanged);
         connect(m_manageButton, &QAbstractButton::clicked,
                 this, &DeviceKitAspectWidget::manageDevices);

src/plugins/projectexplorer/projectconfigurationaspects.cpp

@@ -404,7 +404,7 @@ void BaseIntegerAspect::addToConfigurationLayout(QFormLayout *layout)
     if (d->m_maximumValue.isValid() && d->m_maximumValue.isValid())
         d->m_spinBox->setRange(d->m_minimumValue.toInt(), d->m_maximumValue.toInt());
     layout->addRow(d->m_label, d->m_spinBox);
-    connect(d->m_spinBox.data(), static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(d->m_spinBox.data(), QOverload<int>::of(&QSpinBox::valueChanged),
             this, [this](int value) {
         d->m_value = value;
         emit changed();

src/plugins/projectexplorer/projectexplorersettingspage.cpp

@@ -79,7 +79,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, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
+    connect(m_ui.directoryButtonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
             this, &ProjectExplorerSettingsWidget::slotDirectoryButtonGroupChanged);
     connect(m_ui.buildDirectoryResetButton, &QAbstractButton::clicked,
             this, &ProjectExplorerSettingsWidget::resetBuildDirectoryTemplate);

src/plugins/projectexplorer/projectmodels.cpp

@@ -489,9 +489,7 @@ public:
                 m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
             });
             targetDirLayout->addWidget(m_targetDirChooser);
-            connect(m_buttonGroup,
+            connect(m_buttonGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, [this] {
-                    static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
-                    this, [this] {
                 switch (dropAction()) {
                 case DropAction::CopyWithFiles:
                 case DropAction::MoveWithFiles:

src/plugins/projectexplorer/projectwizardpage.cpp

@@ -284,9 +284,9 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent) : WizardPage(parent),
 {
     m_ui->setupUi(this);
     m_ui->vcsManageButton->setText(ICore::msgShowOptionsDialog());
-    connect(m_ui->projectComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui->projectComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ProjectWizardPage::projectChanged);
-    connect(m_ui->addToVersionControlComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_ui->addToVersionControlComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ProjectWizardPage::versionControlChanged);
     connect(m_ui->vcsManageButton, &QAbstractButton::clicked, this, &ProjectWizardPage::manageVcs);
     setProperty(SHORT_TITLE_PROPERTY, tr("Summary"));
@@ -299,7 +299,7 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent) : WizardPage(parent),
 
 ProjectWizardPage::~ProjectWizardPage()
 {
-    disconnect(m_ui->projectComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    disconnect(m_ui->projectComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
                this, &ProjectWizardPage::projectChanged);
     delete m_ui;
 }

src/plugins/projectexplorer/runsettingspropertiespage.cpp

@@ -162,7 +162,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
 
     connect(m_addDeployMenu, &QMenu::aboutToShow,
             this, &RunSettingsWidget::aboutToShowDeployMenu);
-    connect(m_deployConfigurationCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_deployConfigurationCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &RunSettingsWidget::currentDeployConfigurationChanged);
     connect(m_removeDeployToolButton, &QAbstractButton::clicked,
             this, &RunSettingsWidget::removeDeployConfiguration);
@@ -201,7 +201,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
 
     connect(m_addRunToolButton, &QAbstractButton::clicked,
             this, &RunSettingsWidget::showAddRunConfigDialog);
-    connect(m_runConfigurationCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(m_runConfigurationCombo, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &RunSettingsWidget::currentRunConfigurationChanged);
     connect(m_removeRunToolButton, &QAbstractButton::clicked,
             this, &RunSettingsWidget::removeRunConfiguration);

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -553,11 +553,11 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
     m_ui->qmlDebuggingWarningIcon->setPixmap(Utils::Icons::WARNING.pixmap());
 
     connect(m_ui->buildVariantComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &QbsBuildStepConfigWidget::changeBuildVariant);
     connect(m_ui->keepGoingCheckBox, &QAbstractButton::toggled,
             this, &QbsBuildStepConfigWidget::changeKeepGoing);
-    connect(m_ui->jobSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(m_ui->jobSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &QbsBuildStepConfigWidget::changeJobCount);
     connect(m_ui->showCommandLinesCheckBox, &QCheckBox::toggled, this,
             &QbsBuildStepConfigWidget::changeShowCommandLines);

src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp

@@ -152,7 +152,7 @@ void QbsProfilesSettingsWidget::refreshKitsList()
         m_ui.kitsComboBox->setCurrentIndex(0);
     displayCurrentProfile();
     connect(m_ui.kitsComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &QbsProfilesSettingsWidget::displayCurrentProfile);
 }
 

src/plugins/qmakeprojectmanager/externaleditors.cpp

@@ -288,8 +288,7 @@ bool DesignerExternalEditor::startEditor(const QString &fileName, QString *error
         m_processCache.insert(binary, socket);
         auto mapSlot = [this, binary] { processTerminated(binary); };
         connect(socket, &QAbstractSocket::disconnected, this, mapSlot);
-        connect(socket,
+        connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
-                static_cast<void (QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error),
                 this, mapSlot);
     }
     return true;

src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp

@@ -947,7 +947,7 @@ InternalLibraryDetailsController::InternalLibraryDetailsController(
         libraryDetailsWidget()->useSubfoldersCheckBox->setEnabled(true);
 
     connect(libraryDetailsWidget()->libraryComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &InternalLibraryDetailsController::slotCurrentLibraryChanged);
 
     updateProFile();

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -561,7 +561,7 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
     connect(m_ui->qmakeAdditonalArgumentsLineEdit, &QLineEdit::textEdited,
             this, &QMakeStepConfigWidget::qmakeArgumentsLineEdited);
     connect(m_ui->buildConfigurationComboBox,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &QMakeStepConfigWidget::buildConfigurationSelected);
     connect(m_ui->qmlDebuggingLibraryCheckBox, &QCheckBox::toggled,
             this, &QMakeStepConfigWidget::linkQmlDebuggingLibraryChecked);

src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp

@@ -90,7 +90,7 @@ QWidget *ChangeStyleWidgetAction::createWidget(QWidget *parent)
     });
 
     connect(comboBox,
-            static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::activated),
+            QOverload<const QString &>::of(&QComboBox::activated),
             this,
             [this](const QString &style) {
 

src/plugins/qmldesigner/components/formeditor/backgroundaction.cpp

@@ -64,7 +64,7 @@ QWidget *BackgroundAction::createWidget(QWidget *parent)
     }
 
     comboBox->setCurrentIndex(0);
-    connect(comboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+    connect(comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &BackgroundAction::emitBackgroundChanged);
 
     comboBox->setProperty("hideborder", true);

src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

@@ -143,17 +143,17 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
    const int second = 1000;
    const int waitConstant = 8 * second;
    if (m_qmlPuppetEditorProcess->waitForStarted(waitConstant)) {
-       connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+       connect(m_qmlPuppetEditorProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater);
     qCInfo(instanceViewBenchmark) << "puppets started:" << m_benchmarkTimer.elapsed();
 
        if (runModus == NormalModus) {
            m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2);
-           connect(m_qmlPuppetPreviewProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+           connect(m_qmlPuppetPreviewProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                 m_qmlPuppetPreviewProcess.data(), &QProcess::deleteLater);
 
            m_qmlPuppetRenderProcess->waitForStarted(waitConstant / 2);
-           connect(m_qmlPuppetRenderProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+           connect(m_qmlPuppetRenderProcess.data(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
                 m_qmlPuppetRenderProcess.data(), &QProcess::deleteLater);
        }
 

src/plugins/qmldesigner/qmldesignerextension/connectioneditor/delegates.cpp

@@ -167,7 +167,7 @@ QWidget *BindingDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt
         default: qWarning() << "BindingDelegate::createEditor column" << index.column();
         }
 
-        connect(bindingComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() {
+        connect(bindingComboBox, QOverload<int>::of(&QComboBox::activated), this, [=]() {
             auto delegate = const_cast<BindingDelegate*>(this);
             emit delegate->commitData(bindingComboBox);
         });
@@ -214,7 +214,7 @@ QWidget *DynamicPropertiesDelegate::createEditor(QWidget *parent, const QStyleOp
         case DynamicPropertiesModel::PropertyTypeRow: {
 
             auto dynamicPropertiesComboBox = new PropertiesComboBox(parent);
-            connect(dynamicPropertiesComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() {
+            connect(dynamicPropertiesComboBox, QOverload<int>::of(&QComboBox::activated), this, [=]() {
                 auto delegate = const_cast<DynamicPropertiesDelegate*>(this);
                 emit delegate->commitData(dynamicPropertiesComboBox);
             });
@@ -308,7 +308,7 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent, const QStyleOptionVie
     default: qWarning() << "ConnectionDelegate::createEditor column" << index.column();
     }
 
-    connect(connectionComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() {
+    connect(connectionComboBox, QOverload<int>::of(&QComboBox::activated), this, [=]() {
         auto delegate = const_cast<ConnectionDelegate*>(this);
         emit delegate->commitData(connectionComboBox);
     });
@@ -335,7 +335,7 @@ QWidget *BackendDelegate::createEditor(QWidget *parent, const QStyleOptionViewIt
         case BackendModel::TypeNameColumn: {
             auto backendComboBox = new PropertiesComboBox(parent);
             backendComboBox->addItems(model->possibleCppTypes());
-            connect(backendComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, [=]() {
+            connect(backendComboBox, QOverload<int>::of(&QComboBox::activated), this, [=]() {
                 auto delegate = const_cast<BackendDelegate*>(this);
                 emit delegate->commitData(backendComboBox);
             });

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/canvasstyledialog.cpp

@@ -100,7 +100,7 @@ CanvasStyleDialog::CanvasStyleDialog(const CanvasStyle &style, QWidget *parent)
         emit styleChanged(out);
     };
 
-    auto doubleValueChanged = static_cast<void (QDoubleSpinBox::*)(double)>(
+    auto doubleValueChanged = QOverload<double>::of(
         &QDoubleSpinBox::valueChanged);
     auto colorValueChanged = &ColorControl::valueChanged;
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/easingcurvedialog.cpp

@@ -146,7 +146,7 @@ EasingCurveDialog::EasingCurveDialog(const QList<ModelNode> &frames, QWidget *pa
     connect(m_presets, &PresetEditor::presetChanged, m_splineEditor, &SplineEditor::setEasingCurve);
 
     connect(durationEdit,
-            static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+            QOverload<int>::of(&QSpinBox::valueChanged),
             m_splineEditor,
             &SplineEditor::setDuration);
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineanimationform.cpp

@@ -56,7 +56,7 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
     connectSpinBox(ui->startFrame, "from");
     connectSpinBox(ui->endFrame, "to");
 
-    connect(ui->loops, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [this]() {
+    connect(ui->loops, QOverload<int>::of(&QSpinBox::valueChanged), [this]() {
         ui->continuous->setChecked(ui->loops->value() == -1);
     });
 
@@ -106,7 +106,7 @@ TimelineAnimationForm::TimelineAnimationForm(QWidget *parent)
     });
 
     connect(ui->transitionToState,
-            static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
+            QOverload<int>::of(&QComboBox::activated),
             [this](int index) {
                 if (!m_animation.isValid())
                     return;