diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2018-10-12 10:33:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-10-24 15:18:44 +0200 |
| commit | 345e6b0213b1273b698163064f80d33bc7ce64a9 (patch) | |
| tree | 6eb393d7f42b5ba3654c42e3bca91fcd244138eb /tests | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
Set qlogging test helper executable name via define
In the cmake port the helper executable may have a different name.
Change-Id: I0af68e73253c7f0e6680ca6f10a6ae25e336e923
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/global/qlogging/test/test.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qlogging/tst_qlogging.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro index 91896d4494..81445247e0 100644 --- a/tests/auto/corelib/global/qlogging/test/test.pro +++ b/tests/auto/corelib/global/qlogging/test/test.pro @@ -19,3 +19,4 @@ SOURCES = ../tst_qlogging.cpp DEFINES += QT_MESSAGELOGCONTEXT DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +DEFINES += HELPER_BINARY=\\\"helper\\\" diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp index d3ed1a6d0d..9df54e17d3 100644 --- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp +++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp @@ -822,7 +822,7 @@ void tst_qmessagehandler::qMessagePattern() QProcess process; #ifndef Q_OS_ANDROID - const QString appExe(QLatin1String("helper")); + const QString appExe(QLatin1String(HELPER_BINARY)); #else const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so")); #endif @@ -872,7 +872,7 @@ void tst_qmessagehandler::setMessagePattern() QProcess process; #ifndef Q_OS_ANDROID - const QString appExe(QLatin1String("helper")); + const QString appExe(QLatin1String(HELPER_BINARY)); #else const QString appExe(QCoreApplication::applicationDirPath() + QLatin1String("/libhelper.so")); #endif |