diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-12 00:15:53 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-20 13:01:29 +0000 |
commit | dfd3db5db85fb7a6a119b27ce047c4813b29ea03 (patch) | |
tree | 0d417a18c26c44a35f70e1077e7c1dcf6aaf97a1 | |
parent | 8d3bd1cfabb86de10712dcbe0dd614f31af161b7 (diff) |
Revert "QQmlPreview: remove the ignore of :/qgradient/"
The corresponding commit in qtbase has been reverted.
This reverts commit 1989323559a7bc08a469f9708c644dcad1f57600.
Task-number: QTBUG-84069
Change-Id: Ie042a34ea41baf538c922ed9c7280907475f759a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp | 1 | ||||
-rw-r--r-- | tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp index acd19a6f73..bb43f75c63 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileloader.cpp @@ -54,6 +54,7 @@ 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"); diff --git a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp index bfec776614..2de525db54 100644 --- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp +++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp @@ -122,6 +122,7 @@ void checkFiles(const QStringList &files) { QVERIFY(!files.contains("/etc/localtime")); QVERIFY(!files.contains("/etc/timezome")); + QVERIFY(!files.contains(":/qgradient/webgradients.binaryjson")); } void tst_QQmlPreview::cleanup() |