Mark the whole repo with QT_NO_CONTEXTLESS_CONNECT

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

This amends commit c44fa839135e494f9d7fb6ffcf759ed1f4bf6952.

Task-number: QTBUG-116296
Change-Id: I275c90db11ecec05cc043b03c0268744b5d96644
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>

6 files changed, 8 insertions, 10 deletions

diff --git a/.cmake.conf b/.cmake.conf
index d4121fe..377611d 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -4,3 +4,4 @@ set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
 list(APPEND 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/src/declarative_opcua/CMakeLists.txt b/src/declarative_opcua/CMakeLists.txt
index a90f754..128ba3c 100644
--- a/src/declarative_opcua/CMakeLists.txt
+++ b/src/declarative_opcua/CMakeLists.txt
@@ -37,8 +37,6 @@ qt_internal_add_qml_module(DeclarativeOpcua
         opcuawriteitem.cpp opcuawriteitem_p.h
         opcuawriteresult.cpp opcuawriteresult_p.h
         universalnode.cpp universalnode_p.h
-    DEFINES
-        QT_NO_CONTEXTLESS_CONNECT
     LIBRARIES
         Qt::CorePrivate
     PUBLIC_LIBRARIES
diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt
index 568bf4f..e8be578 100644
--- a/src/opcua/CMakeLists.txt
+++ b/src/opcua/CMakeLists.txt
@@ -67,8 +67,7 @@ qt_internal_add_module(OpcUa
         core/qopcuaplugin.cpp core/qopcuaplugin.h
         core/qopcuaprovider.cpp core/qopcuaprovider.h
         qopcuaglobal.h
-    DEFINES
-        QT_NO_CONTEXTLESS_CONNECT
+
     LIBRARIES
         Qt::CorePrivate
         Qt::NetworkPrivate
diff --git a/src/plugins/opcua/open62541/CMakeLists.txt b/src/plugins/opcua/open62541/CMakeLists.txt
index 2c22656..2a3cae8 100644
--- a/src/plugins/opcua/open62541/CMakeLists.txt
+++ b/src/plugins/opcua/open62541/CMakeLists.txt
@@ -17,8 +17,6 @@ qt_internal_add_plugin(QOpen62541Plugin
         qopen62541subscription.cpp qopen62541subscription.h
         qopen62541utils.cpp qopen62541utils.h
         qopen62541valueconverter.cpp qopen62541valueconverter.h
-    DEFINES
-        QT_NO_CONTEXTLESS_CONNECT
     LIBRARIES
         Qt::Core
         Qt::CorePrivate
diff --git a/src/plugins/opcua/uacpp/CMakeLists.txt b/src/plugins/opcua/uacpp/CMakeLists.txt
index 493d70b..7d71e39 100644
--- a/src/plugins/opcua/uacpp/CMakeLists.txt
+++ b/src/plugins/opcua/uacpp/CMakeLists.txt
@@ -16,8 +16,6 @@ qt_internal_add_plugin(QUACppPlugin
         quacppsubscription.cpp quacppsubscription.h
         quacpputils.cpp quacpputils.h
         quacppvalueconverter.cpp quacppvalueconverter.h
-    DEFINES
-        QT_NO_CONTEXTLESS_CONNECT
     LIBRARIES
         Qt::Core
         Qt::CorePrivate
diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp
index fbe4c56..cefa9e9 100644
--- a/tests/auto/security/tst_security.cpp
+++ b/tests/auto/security/tst_security.cpp
@@ -261,7 +261,9 @@ void Tst_QOpcUaSecurity::connectAndDisconnectSecureUnencryptedKey()
     qDebug() << "Testing security policy" << endpoint.securityPolicy();
     QSignalSpy connectSpy(client.data(), &QOpcUaClient::stateChanged);
     int passwordRequestSpy = 0;
-    connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired, [&passwordRequestSpy](const QString &privateKeyFilePath, QString *password, bool previousTryFailed) {
+    connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired,
+            this, [&passwordRequestSpy](const QString &privateKeyFilePath, QString *password,
+                                        bool previousTryFailed) {
         Q_UNUSED(privateKeyFilePath);
         Q_UNUSED(previousTryFailed);
         Q_UNUSED(password);
@@ -335,7 +337,9 @@ void Tst_QOpcUaSecurity::connectAndDisconnectSecureEncryptedKey()
     qDebug() << "Testing security policy" << endpoint.securityPolicy();
     QSignalSpy connectSpy(client.data(), &QOpcUaClient::stateChanged);
     int passwordRequestSpy = 0;
-    connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired, [&passwordRequestSpy, &pkiConfig](const QString &privateKeyFilePath, QString *password, bool previousTryFailed) {
+    connect(client.data(), &QOpcUaClient::passwordForPrivateKeyRequired,
+            this, [&passwordRequestSpy, &pkiConfig](const QString &privateKeyFilePath,
+                                                    QString *password, bool previousTryFailed) {
         qDebug() << "Password requested";
         if (passwordRequestSpy == 0) {
             QVERIFY(password->isEmpty());