From 3cfd1f282258477d875482cf9df0dcd3de3019e1 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Sat, 14 Mar 2020 22:05:35 +0100 Subject: Revert "Prospective build fix for MinGW" This reverts commit 58a4d5b54968bdcd042113a1a5200db7e6f7547b. The design changes for MinGW caused some regressions, which needed to be reverted. The same applies for this patch. Task-number: QTBUG-82868 Change-Id: I11ede47795e019037927fe5a0966e791ba5fe82f Reviewed-by: Simon Hausmann --- tests/auto/clientSetupInCpp/tst_clientSetupInCpp.cpp | 2 +- tests/auto/connection/tst_connection.cpp | 2 +- tests/auto/declarative/tst_opcua.cpp | 2 +- tests/auto/qopcuaclient/tst_client.cpp | 2 +- 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") -- cgit v1.2.3