From 024eeee74528a4e9e500234b8fb2f2c8e1d941d7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 28 Aug 2020 15:37:32 +0200 Subject: [PATCH] QmlDesigner: Enable Timeline for MCU, but blacklist FlowView Task-number: QDS-2681 Change-Id: I1b4eb312ce88e1ee7bf052020fd4e9d5cf95021c Reviewed-by: Aleksei German Reviewed-by: Thomas Hartmann --- .../components/importmanager/importswidget.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp index 650033a42d8..4d8f134d903 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 possibleImports) QList 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; }