diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-03-16 10:37:35 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-03-16 10:37:35 +0200 |
commit | 179b2a8fe8f495022fef8cd56fbe8face268a45c (patch) | |
tree | 9c6f6d7d855602e01f3dccf970ad9aad6c101755 | |
parent | 35dc39d77ba8c8e6cc750b64ff53e69155dea97f (diff) | |
parent | 3cfd1f282258477d875482cf9df0dcd3de3019e1 (diff) |
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Change-Id: I479a37eaa6d802cdcfa2010ffdc10e242e8e18ad
-rw-r--r-- | tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp | 2 | ||||
-rw-r--r-- | tests/auto/connection/tst_connection.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/tst_opcua.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qopcuaclient/tst_client.cpp | 2 | ||||
-rw-r--r-- | tests/auto/security/tst_security.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp b/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp index e4ed7ee..2e6eed7 100644 --- a/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp +++ b/tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp @@ -124,7 +124,7 @@ public slots: + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) +#ifdef Q_OS_WIN + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/connection/tst_connection.cpp b/tests/auto/connection/tst_connection.cpp index 850f1f6..639cd5d 100644 --- a/tests/auto/connection/tst_connection.cpp +++ b/tests/auto/connection/tst_connection.cpp @@ -118,7 +118,7 @@ void Tst_Connection::initTestCase() + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) +#ifdef Q_OS_WIN + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/declarative/tst_opcua.cpp b/tests/auto/declarative/tst_opcua.cpp index f1fcf7c..53816b4 100644 --- a/tests/auto/declarative/tst_opcua.cpp +++ b/tests/auto/declarative/tst_opcua.cpp @@ -74,7 +74,7 @@ public slots: + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) +#ifdef Q_OS_WIN + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp index 492d335..cde84d5 100644 --- a/tests/auto/qopcuaclient/tst_client.cpp +++ b/tests/auto/qopcuaclient/tst_client.cpp @@ -568,7 +568,7 @@ void Tst_QOpcUaClient::initTestCase() + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) +#ifdef Q_OS_WIN + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp index ad2b717..6b68bc2 100644 --- a/tests/auto/security/tst_security.cpp +++ b/tests/auto/security/tst_security.cpp @@ -188,7 +188,7 @@ void Tst_QOpcUaSecurity::initTestCase() + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) +#ifdef Q_OS_WIN + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") |