diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-25 20:57:38 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-25 20:57:38 +0200 |
| commit | 48dce24717ca537a6f5d817b2f5cd689df86ad68 (patch) | |
| tree | 72c8cc3161f84b9d97bca5014f107d8190a58338 /tests | |
| parent | 8b7dbfe1e0c0d4b8d0984fb381f1a0bb6b566e76 (diff) | |
| parent | ec73b9ff3b0064cf7760baeb826d912d9a30d227 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I12efb77e812364052eca12ea35219ceff64d7cc3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp index ab5e958323..bd44bd7c8b 100644 --- a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp +++ b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp @@ -80,6 +80,10 @@ void tst_qqmlextensionplugin::iidCheck_data() QList<QString> files; for (QDirIterator it(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath), QDirIterator::Subdirectories); it.hasNext(); ) { QString file = it.next(); +#if defined(Q_OS_DARWIN) + if (file.contains(QLatin1String(".dSYM/"))) + continue; +#endif if (file.endsWith(SUFFIX)) { files << file; } |