aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2020-08-28 15:37:32 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2020-08-29 10:41:44 +0000
commit024eeee74528a4e9e500234b8fb2f2c8e1d941d7 (patch)
tree4da926757a656a82d4338ef21fa4af2b94bcba45 /src
parentee281afa733ee0cf9a6a23d648485961da995678 (diff)
QmlDesigner: Enable Timeline for MCU, but blacklist FlowView
Task-number: QDS-2681 Change-Id: I1b4eb312ce88e1ee7bf052020fd4e9d5cf95021c Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/components/importmanager/importswidget.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
index 650033a42d..4d8f134d90 100644
--- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
@@ -99,12 +99,16 @@ void ImportsWidget::setPossibleImports(QList<Import> possibleImports)
QList<Import> filteredImports;
- const QStringList mcuWhiteList = {"QtQuick", "QtQuick.Controls"};
+ const QStringList mcuWhiteList = {"QtQuick", "QtQuick.Controls", "QtQuick.Timeline"};
+ const QStringList mcuBlackList = {"FlowView"};
if (isQtForMCUs) {
- filteredImports = Utils::filtered(possibleImports, [mcuWhiteList](const Import &import) {
- return mcuWhiteList.contains(import.url()) || !import.url().startsWith("Qt");
- });
+ filteredImports = Utils::filtered(possibleImports,
+ [mcuWhiteList, mcuBlackList](const Import &import) {
+ return (mcuWhiteList.contains(import.url())
+ || !import.url().startsWith("Qt"))
+ && !mcuBlackList.contains(import.url());
+ });
} else {
filteredImports = possibleImports;
}