diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 10:43:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 10:46:22 +0200 |
| commit | 18934bcb0c388eb4723043cb5001702fecaf90bc (patch) | |
| tree | 59f4f1e5de00fa49e49bace1a38f1bce52e48457 /tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp | |
| parent | bc5454d2c41873349ea32c42aca8fc794cba442e (diff) | |
| parent | d1210281e41008ce2e3510aa5cfb3ebea1c57734 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/global/qglobal.cpp
Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f
Diffstat (limited to 'tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp')
| -rw-r--r-- | tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp index 8c2886f337..c537e43802 100644 --- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp +++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp @@ -126,6 +126,14 @@ void tst_QFileSelector::basicTest_data() QTest::newRow("platform3") << QString(":/platforms/test3") << QStringList() << expectedPlatform3File; +#ifdef Q_OS_MACOS + // special case for compatibility code + QTest::newRow("osx-compat") << QString(":/platforms/test4") << QStringList() + << ":/platforms/+osx/test4"; + QTest::newRow("mac-compat") << QString(":/platforms/test5") << QStringList() + << ":/platforms/+mac/test5"; +#endif + QString resourceTestPath(":/extras/test"); QString custom1("custom1"); QTest::newRow("custom1-noselector") << resourceTestPath << QStringList() |