aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2020-09-02 09:34:18 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2020-09-02 10:02:33 +0000
commit8259c1e0e7d174826756b59ded169442c78375a2 (patch)
treed717bed1ff1f0bfccf1e869ac824c0291f9f5d0d
parentde38744bba8793260d82b46d718bfad2fb9c20a8 (diff)
QmlDesigner: Disable FlowTags for MCU
Change-Id: I708dad46d92c48991a603819313ce148eccc3b54 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/components/importmanager/importswidget.cpp10
-rw-r--r--src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp12
2 files changed, 13 insertions, 9 deletions
diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
index 4d8f134d90..d69511acd6 100644
--- a/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importswidget.cpp
@@ -99,15 +99,15 @@ void ImportsWidget::setPossibleImports(QList<Import> possibleImports)
QList<Import> filteredImports;
- const QStringList mcuWhiteList = {"QtQuick", "QtQuick.Controls", "QtQuick.Timeline"};
- const QStringList mcuBlackList = {"FlowView"};
+ const QStringList mcuPostiveList = {"QtQuick", "QtQuick.Controls", "QtQuick.Timeline"};
+ const QStringList mcuNegativeList = {"FlowView"};
if (isQtForMCUs) {
filteredImports = Utils::filtered(possibleImports,
- [mcuWhiteList, mcuBlackList](const Import &import) {
- return (mcuWhiteList.contains(import.url())
+ [mcuPostiveList, mcuNegativeList](const Import &import) {
+ return (mcuPostiveList.contains(import.url())
|| !import.url().startsWith("Qt"))
- && !mcuBlackList.contains(import.url());
+ && !mcuNegativeList.contains(import.url());
});
} else {
filteredImports = possibleImports;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index ea81fb4fcf..8526e8a1f5 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -351,6 +351,8 @@ void ItemLibraryWidget::reloadQmlSource()
void ItemLibraryWidget::setupImportTagWidget()
{
QTC_ASSERT(m_model, return);
+ const DesignDocument *designDocument = QmlDesignerPlugin::instance()->currentDesignDocument();
+ const bool isQtForMCUs = designDocument && designDocument->isQtForMCUsProject();
const QStringList imports = m_model->metaInfo().itemLibraryInfo()->showTagsForImports();
@@ -373,11 +375,13 @@ void ItemLibraryWidget::setupImportTagWidget()
return button;
};
- for (const QString &importPath : imports) {
- const Import import = Import::createLibraryImport(importPath);
- if (!m_model->hasImport(import, true, true)
+ if (!isQtForMCUs) {
+ for (const QString &importPath : imports) {
+ const Import import = Import::createLibraryImport(importPath);
+ if (!m_model->hasImport(import, true, true)
&& m_model->isImportPossible(import, true, true))
- flowLayout->addWidget(createButton(importPath));
+ flowLayout->addWidget(createButton(importPath));
+ }
}
}