diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-23 19:19:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-23 19:23:37 +0200 |
| commit | 58a4d5b54968bdcd042113a1a5200db7e6f7547b (patch) | |
| tree | e9a4a5bfc5778ffe491f2aa240502a87a89454f0 | |
| parent | dfc8e26b1f84c4b48d9247202fd3d4d0cb247825 (diff) | |
Prospective build fix for MinGWv5.14.0-alpha1
After commit 4d289edb14aeb4976218cc306bfc514e37521b82 in qtbase,
debug-and-release is not unconditional on Windows anymore -- it's off
for MinGW. Therefore path tricks to get out of a debug/ or release/
folder need to be guarded with the feature.
Task-number: QTBUG-78704
Change-Id: Idd1e9c1eae4696cd0322d4d991e92b7f1309fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -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 2e6eed7..e4ed7ee 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 -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/connection/tst_connection.cpp b/tests/auto/connection/tst_connection.cpp index 639cd5d..850f1f6 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 -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/declarative/tst_opcua.cpp b/tests/auto/declarative/tst_opcua.cpp index 53816b4..f1fcf7c 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 -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp index b665f2c..047422f 100644 --- a/tests/auto/qopcuaclient/tst_client.cpp +++ b/tests/auto/qopcuaclient/tst_client.cpp @@ -565,7 +565,7 @@ void Tst_QOpcUaClient::initTestCase() + QLatin1String("/../../open62541-testserver/open62541-testserver.app/Contents/MacOS/open62541-testserver") #else -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") diff --git a/tests/auto/security/tst_security.cpp b/tests/auto/security/tst_security.cpp index 6b68bc2..ad2b717 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 -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && QT_CONFIG(debug_and_release) + QLatin1String("/..") #endif + QLatin1String("/../../open62541-testserver/open62541-testserver") |