Testlib: fix the last few s/Q_OS_MAC/Q_OS_DARWIN/w
Change-Id: I6fe6a865aea37c6a2d153bd2c3aace5242362c88 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
This commit is contained in:
parent
656729c5b6
commit
9896ebf93d
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user