diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-10-04 10:47:29 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-10-05 07:03:48 +0000 |
| commit | 08342d761369c3755778f6d69fa6f5907ae1aead (patch) | |
| tree | 0e7a740fc0608fbbd464707ccf04daa7d23aaced /src/plugins | |
| parent | f3b745feafd2c1495ccf3e544929cb99d39ebc4c (diff) | |
Whitelist the Qt tests path
Having that blacklisted only provides some bullet/foot interaction when
running the test on an installed Qt. Just leaving it out of blacklist is
not enough as the prefix and data paths are usually parents of the tests
path.
Change-Id: I480ecd88716a2f0084c1acbb8c29cde2c2b4590a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp index 560b1a84b2..9927089e5e 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp @@ -57,7 +57,7 @@ QQmlPreviewFileLoader::QQmlPreviewFileLoader(QQmlPreviewServiceImpl *service) : // Target specific configuration should not replaced with files from the host. m_blacklist.blacklist("/etc"); - for (int loc = QLibraryInfo::PrefixPath; loc <= QLibraryInfo::TestsPath; ++loc) { + for (int loc = QLibraryInfo::PrefixPath; loc < QLibraryInfo::TestsPath; ++loc) { m_blacklist.blacklist(QLibraryInfo::location( static_cast<QLibraryInfo::LibraryLocation>(loc))); } @@ -80,6 +80,8 @@ QQmlPreviewFileLoader::QQmlPreviewFileLoader(QQmlPreviewServiceImpl *service) : m_blacklist.blacklist(location); } + m_blacklist.whitelist(QLibraryInfo::location(QLibraryInfo::TestsPath)); + connect(this, &QQmlPreviewFileLoader::request, service, &QQmlPreviewServiceImpl::forwardRequest, Qt::DirectConnection); connect(service, &QQmlPreviewServiceImpl::directory, this, &QQmlPreviewFileLoader::directory); |