Mark the whole repo with QT_NO_CONTEXTLESS_CONNECT

By adding it to the default build flags via .cmake.conf.

This disables the 3-arg QObject::connect() overload:
QObject::connect(sender, signal, functor)

For details see:
https://lists.qt-project.org/pipermail/development/2023-July/044141.html

Task-number: QTBUG-116296
Change-Id: I493e7760772831adc0e42eb45b434c3ed2d046d0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

10 files changed, 14 insertions, 13 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 734bc2d..64c9846 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -2,3 +2,4 @@ set(QT_REPO_MODULE_VERSION "6.7.0")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
 list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1")
diff --git a/examples/serialbus/can/connectdialog.cpp b/examples/serialbus/can/connectdialog.cpp
index 4db9646..3b18f17 100644
--- a/examples/serialbus/can/connectdialog.cpp
+++ b/examples/serialbus/can/connectdialog.cpp
@@ -37,7 +37,7 @@ ConnectDialog::ConnectDialog(QWidget *parent) :
             this, &ConnectDialog::pluginChanged);
     connect(m_ui->interfaceListBox, &QComboBox::currentTextChanged,
             this, &ConnectDialog::interfaceChanged);
-    connect(m_ui->ringBufferBox, &QCheckBox::stateChanged, [this](int state){
+    connect(m_ui->ringBufferBox, &QCheckBox::stateChanged, this, [this](int state){
             m_ui->ringBufferLimitBox->setEnabled(state == Qt::CheckState::Checked);
     });
 
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index 3234043..7b1dc07 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -61,7 +61,7 @@ void MainWindow::initActionsConnections()
     m_ui->sendFrameBox->setEnabled(false);
 
     connect(m_ui->sendFrameBox, &SendFrameBox::sendFrame, this, &MainWindow::sendFrame);
-    connect(m_ui->actionConnect, &QAction::triggered, [this]() {
+    connect(m_ui->actionConnect, &QAction::triggered, this, [this]() {
         m_canDevice.release()->deleteLater();
         m_connectDialog->show();
     });
diff --git a/examples/serialbus/can/sendframebox.cpp b/examples/serialbus/can/sendframebox.cpp
index 4f6025f..a0e2c48 100644
--- a/examples/serialbus/can/sendframebox.cpp
+++ b/examples/serialbus/can/sendframebox.cpp
@@ -203,11 +203,11 @@ SendFrameBox::SendFrameBox(QWidget *parent) :
                                          ? QString() : tr("Cannot send because Payload hex string is invalid."));
         }
     };
-    connect(m_ui->frameIdEdit, &QLineEdit::textChanged, frameIdOrPayloadChanged);
-    connect(m_ui->payloadEdit, &QLineEdit::textChanged, frameIdOrPayloadChanged);
+    connect(m_ui->frameIdEdit, &QLineEdit::textChanged, this, frameIdOrPayloadChanged);
+    connect(m_ui->payloadEdit, &QLineEdit::textChanged, this, frameIdOrPayloadChanged);
     frameIdOrPayloadChanged();
 
-    connect(m_ui->sendButton, &QPushButton::clicked, [this]() {
+    connect(m_ui->sendButton, &QPushButton::clicked, this, [this]() {
     //! [prepare_can_frame]
         const uint frameId = m_ui->frameIdEdit->text().toUInt(nullptr, 16);
         QString data = m_ui->payloadEdit->text();
diff --git a/examples/serialbus/modbus/client/mainwindow.cpp b/examples/serialbus/modbus/client/mainwindow.cpp
index 308e8d1..90cf6f5 100644
--- a/examples/serialbus/modbus/client/mainwindow.cpp
+++ b/examples/serialbus/modbus/client/mainwindow.cpp
@@ -151,7 +151,7 @@ void MainWindow::onConnectTypeChanged(int index)
     }
 //! [create_client_0]
 
-    connect(modbusDevice, &QModbusClient::errorOccurred, [this](QModbusDevice::Error) {
+    connect(modbusDevice, &QModbusClient::errorOccurred, this, [this](QModbusDevice::Error) {
         statusBar()->showMessage(modbusDevice->errorString(), 5000);
     });
 
diff --git a/examples/serialbus/modbus/client/settingsdialog.cpp b/examples/serialbus/modbus/client/settingsdialog.cpp
index 2ca0c31..74f7a55 100644
--- a/examples/serialbus/modbus/client/settingsdialog.cpp
+++ b/examples/serialbus/modbus/client/settingsdialog.cpp
@@ -19,7 +19,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     ui->timeoutSpinner->setValue(m_settings.responseTime);
     ui->retriesSpinner->setValue(m_settings.numberOfRetries);
 
-    connect(ui->applyButton, &QPushButton::clicked, [this]() {
+    connect(ui->applyButton, &QPushButton::clicked, this, [this]() {
 #if QT_CONFIG(modbus_serialport)
         m_settings.parity = ui->parityCombo->currentIndex();
         if (m_settings.parity > 0)
diff --git a/examples/serialbus/modbus/custom/mainwindow.cpp b/examples/serialbus/modbus/custom/mainwindow.cpp
index 10cbf1e..2894634 100644
--- a/examples/serialbus/modbus/custom/mainwindow.cpp
+++ b/examples/serialbus/modbus/custom/mainwindow.cpp
@@ -44,13 +44,13 @@ void MainWindow::setupConnections()
 
     // client
     connect(&m_client, &QModbusServer::stateChanged, this, &MainWindow::onStateChanged);
-    connect(&m_client, &QModbusServer::errorOccurred, [this](QModbusDevice::Error) {
+    connect(&m_client, &QModbusServer::errorOccurred, this, [this](QModbusDevice::Error) {
         statusBar()->showMessage(m_client.errorString(), 5000);
     });
 
     // server
     connect(&m_server, &QModbusServer::dataWritten, this, &MainWindow::updateWidgets);
-    connect(&m_server, &QModbusServer::errorOccurred, [this](QModbusDevice::Error) {
+    connect(&m_server, &QModbusServer::errorOccurred, this, [this](QModbusDevice::Error) {
         statusBar()->showMessage(m_server.errorString(), 5000);
     });
 }
diff --git a/examples/serialbus/modbus/server/settingsdialog.cpp b/examples/serialbus/modbus/server/settingsdialog.cpp
index f4721a7..1a6c9b7 100644
--- a/examples/serialbus/modbus/server/settingsdialog.cpp
+++ b/examples/serialbus/modbus/server/settingsdialog.cpp
@@ -17,7 +17,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     ui->stopBitsCombo->setCurrentText(QString::number(m_settings.stopBits));
 #endif
 
-    connect(ui->applyButton, &QPushButton::clicked, [this]() {
+    connect(ui->applyButton, &QPushButton::clicked, this, [this]() {
 #if QT_CONFIG(modbus_serialport)
         m_settings.parity = ui->parityCombo->currentIndex();
         if (m_settings.parity > 0)
diff --git a/tests/auto/plugins/testcanbus/testcanbackend.cpp b/tests/auto/plugins/testcanbus/testcanbackend.cpp
index be7fb40..71e8d37 100644
--- a/tests/auto/plugins/testcanbus/testcanbackend.cpp
+++ b/tests/auto/plugins/testcanbus/testcanbackend.cpp
@@ -12,7 +12,7 @@ QT_BEGIN_NAMESPACE
 TestCanBackend::TestCanBackend() :
     simulateReceivingTimer(new QTimer(this))
 {
-    connect(simulateReceivingTimer, &QTimer::timeout, [this]() {
+    connect(simulateReceivingTimer, &QTimer::timeout, this, [this]() {
         const quint64 timeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
         QCanBusFrame dummyFrame(12, "def");
         dummyFrame.setTimeStamp(QCanBusFrame::TimeStamp::fromMicroSeconds(timeStamp * 1000));
diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
index 4798d50..b627481 100644
--- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
+++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp
@@ -599,7 +599,7 @@ void tst_QCanBusDevice::tst_waitForFramesReceived()
         device->triggerNewFrame();
     });
     QTimer::singleShot(2000, [&]() { device->triggerNewFrame(); });
-    QObject::connect(device.get(), &QCanBusDevice::framesReceived, [this, &handleCounter]() {
+    QObject::connect(device.get(), &QCanBusDevice::framesReceived, this, [this, &handleCounter]() {
         handleCounter++;
         // this should trigger a recursion which we want to catch
         QVERIFY(!device->waitForFramesReceived(5000));
@@ -686,7 +686,7 @@ void tst_QCanBusDevice::tst_waitForFramesWritten()
     device->writeFrame(frame);
     QTimer::singleShot(1000, [&]() { device->writeFrame(frame); });
     QTimer::singleShot(2000, [&]() { device->writeFrame(frame); });
-    QObject::connect(device.get(), &QCanBusDevice::framesWritten, [this, &handleCounter]() {
+    QObject::connect(device.get(), &QCanBusDevice::framesWritten, this, [this, &handleCounter]() {
         handleCounter++;
         // this should trigger a recursion which we want to catch
         QVERIFY(!device->waitForFramesWritten(5000));