diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2023-03-17 17:56:44 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-03-20 19:18:52 +0100 |
| commit | 9896ebf93dab37e68d9f1a9392c799b99aed25cd (patch) | |
| tree | 7c629b49c622c4e4a9eb173d4a4ff7edb5940961 | |
| parent | 656729c5b65104376414e0ac6ef8798c0e63d9b0 (diff) | |
Testlib: fix the last few s/Q_OS_MAC/Q_OS_DARWIN/w
Change-Id: I6fe6a865aea37c6a2d153bd2c3aace5242362c88
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
| -rw-r--r-- | src/testlib/qtestcase.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/findtestdata/findtestdata.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index f255e08f6b..c6d9dc0340 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -707,7 +707,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool QTest::testFunctions.clear(); QTest::testTags.clear(); -#if defined(Q_OS_MAC) && defined(HAVE_XCTEST) +#if defined(Q_OS_DARWIN) && defined(HAVE_XCTEST) if (QXcodeTestLogger::canLogTestProgress()) logFormat = QTestLog::XCTest; #endif diff --git a/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp index f4a9d20fb7..8e48c03074 100644 --- a/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp +++ b/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp @@ -26,7 +26,7 @@ void FindTestData::initTestCase() // verify that our qt.conf is working as expected. QString app_path = QCoreApplication::applicationDirPath(); QString install_path = app_path -#ifdef Q_OS_MAC +#ifdef Q_OS_DARWIN + "/Contents" #endif + "/tests"; @@ -75,7 +75,7 @@ void FindTestData::paths() // 2. at the test install path (faked via qt.conf) QString testfile_path2 = app_path -#ifdef Q_OS_MAC +#ifdef Q_OS_DARWIN + "/Contents" #endif + "/tests/findtestdata/" TESTFILE; |