diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-11 09:57:33 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-13 11:53:05 +0000 |
| commit | f0613e2467416f32e61a7640e9f0011645f4b068 (patch) | |
| tree | 64d380f52fb2bc0c273f521e3d9ed97a77806e3a /src/plugins | |
| parent | 4dbcd6d618e939f43114fdfc56c492e49eedad7a (diff) | |
QML Preview: Blacklist paths ":/qgradient" and "/etc"
":/qgradient" is where the new webgradients introduced in QBrush are
stored. We don't want to load them from the client. Replacing
target-specific files in /etc with files from the host is also a bad
idea.
Change-Id: I3228388713dec29dad1841aedb175dca10cfe1e1
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, 4 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp index 6026d58746..17a3a48184 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp @@ -41,6 +41,10 @@ QQmlPreviewFileLoader::QQmlPreviewFileLoader(QQmlPreviewServiceImpl *service) : m_blacklist.blacklist(":/qt-project.org"); m_blacklist.blacklist(":/QtQuick/Controls/Styles"); m_blacklist.blacklist(":/ExtrasImports/QtQuick/Controls/Styles"); + m_blacklist.blacklist(":/qgradient"); + + // Target specific configuration should not replaced with files from the host. + m_blacklist.blacklist("/etc"); for (int loc = QLibraryInfo::PrefixPath; loc <= QLibraryInfo::TestsPath; ++loc) { m_blacklist.blacklist(QLibraryInfo::location( |