From 039898058cd40e4dfbe8ddefde4cc93aa7af0f58 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Wed, 14 Jun 2023 18:53:12 +0200 Subject: [PATCH] qds: remove Quick Control 1 feature Tab and TabView are not existing in QuickControls 2. Change-Id: I16694d6015927c54087e0b4aeebb8dee245f04f8 Reviewed-by: Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/CMakeLists.txt | 5 - .../formeditor/rotationindicator.cpp | 3 - .../componentsplugin/addtabdesigneraction.cpp | 118 ------------------ .../componentsplugin/addtabdesigneraction.h | 29 ----- .../addtabtotabviewdialog.cpp | 39 ------ .../componentsplugin/addtabtotabviewdialog.h | 25 ---- .../componentsplugin/addtabtotabviewdialog.ui | 85 ------------- .../componentsplugin/componentsplugin.cpp | 10 -- .../entertabdesigneraction.cpp | 116 ----------------- .../componentsplugin/entertabdesigneraction.h | 32 ----- .../componentsplugin/tabviewindexmodel.cpp | 61 --------- .../componentsplugin/tabviewindexmodel.h | 38 ------ .../designercore/include/nodemetainfo.h | 2 - .../designercore/metainfo/nodemetainfo.cpp | 21 ---- .../designercore/model/qmlitemnode.cpp | 6 - .../projectstorage/commontypecache.h | 4 - 16 files changed, 594 deletions(-) delete mode 100644 src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp delete mode 100644 src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h delete mode 100644 src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.cpp delete mode 100644 src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h delete mode 100644 src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.ui delete mode 100644 src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp delete mode 100644 src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h delete mode 100644 src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp delete mode 100644 src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index fdc2bb41d71..08bde98beff 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -1129,13 +1129,8 @@ extend_qtc_plugin(componentsplugin extend_qtc_plugin(componentsplugin SOURCES_PREFIX componentsplugin SOURCES - addtabdesigneraction.cpp addtabdesigneraction.h - addtabtotabviewdialog.cpp addtabtotabviewdialog.h - addtabtotabviewdialog.ui componentsplugin.cpp componentsplugin.h componentsplugin.qrc - entertabdesigneraction.cpp entertabdesigneraction.h - tabviewindexmodel.cpp tabviewindexmodel.h ) add_qtc_plugin(qmlpreviewplugin diff --git a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp index d2c4e90da98..810f14d8248 100644 --- a/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rotationindicator.cpp @@ -42,9 +42,6 @@ namespace { bool itemIsResizable(const ModelNode &modelNode) { - if (modelNode.metaInfo().isQtQuickControlsTab()) - return false; - return NodeHints::fromModelNode(modelNode).isResizable(); } diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp deleted file mode 100644 index f10b9c6b7cc..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "addtabdesigneraction.h" -#include "addtabtotabviewdialog.h" - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -namespace QmlDesigner { - -bool isTabView(const ModelNode &modelNode) -{ - return modelNode.metaInfo().isQtQuickControlsTabView(); -} - -bool isTabAndParentIsTabView(const ModelNode &modelNode) -{ - return modelNode.metaInfo().isQtQuickControlsTab() && modelNode.hasParentProperty() - && modelNode.parentProperty().parentModelNode().metaInfo().isQtQuickControlsTabView(); -} - -AddTabDesignerAction::AddTabDesignerAction() - : AbstractAction(QCoreApplication::translate("TabViewToolAction","Add Tab...")) -{ - connect(action(), &QAction::triggered, this, &AddTabDesignerAction::addNewTab); -} - -QByteArray AddTabDesignerAction::category() const -{ - return QByteArray(); -} - -QByteArray AddTabDesignerAction::menuId() const -{ - return "TabViewAction"; -} - -int AddTabDesignerAction::priority() const -{ - return CustomActionsPriority; -} - -ActionInterface::Type AddTabDesignerAction::type() const -{ - return ContextMenuAction; -} - -bool AddTabDesignerAction::isVisible(const SelectionContext &selectionContext) const -{ - if (selectionContext.singleNodeIsSelected()) { - ModelNode selectedModelNode = selectionContext.currentSingleSelectedNode(); - return isTabView(selectedModelNode) || isTabAndParentIsTabView(selectedModelNode); - } - - return false; -} - -bool AddTabDesignerAction::isEnabled(const SelectionContext &selectionContext) const -{ - return isVisible(selectionContext); -} - -static ModelNode findTabViewModelNode(const ModelNode ¤tModelNode) -{ - if (currentModelNode.metaInfo().isQtQuickControlsTabView()) - return currentModelNode; - else - return findTabViewModelNode(currentModelNode.parentProperty().parentModelNode()); -} - -void AddTabDesignerAction::addNewTab() -{ - QString tabName = AddTabToTabViewDialog::create(QStringLiteral("Tab"), - Core::ICore::dialogParent()); - - if (!tabName.isEmpty()) { - QString directoryPath = QFileInfo(selectionContext().view()->model()->fileUrl().toLocalFile()).absolutePath(); - QString newFilePath = directoryPath +QStringLiteral("/") + tabName + QStringLiteral(".qml"); - - if (QFileInfo::exists(newFilePath)) { - Core::AsynchronousMessageBox::warning(tr("Naming Error"), tr("Component already exists.")); - } else { - const QString sourceString = QStringLiteral("import QtQuick 2.1\nimport QtQuick.Controls 1.0\n\nItem {\n anchors.fill: parent\n}"); - bool fileCreated = DocumentManager::createFile(newFilePath, sourceString); - - if (fileCreated) { - DocumentManager::addFileToVersionControl(directoryPath, newFilePath); - - ModelNode tabViewModelNode = findTabViewModelNode(selectionContext().currentSingleSelectedNode()); - - PropertyListType propertyList; - propertyList.append(QPair("source", QString(tabName + QStringLiteral(".qml")))); - propertyList.append(QPair("title", tabName)); - - ModelNode newTabModelNode = selectionContext().view()->createModelNode("QtQuick.Controls.Tab", - tabViewModelNode.majorVersion(), - tabViewModelNode.minorVersion(), - propertyList); - newTabModelNode.setIdWithRefactoring(newTabModelNode.model()->generateNewId(tabName)); - tabViewModelNode.defaultNodeAbstractProperty().reparentHere(newTabModelNode); - } - } - } -} - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h deleted file mode 100644 index 1a65c8503df..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include "abstractaction.h" - -namespace QmlDesigner { - -class AddTabDesignerAction : public QObject, public AbstractAction -{ - Q_OBJECT -public: - AddTabDesignerAction(); - - QByteArray category() const override; - QByteArray menuId() const override; - int priority() const override; - Type type() const override; - -protected: - bool isVisible(const SelectionContext &selectionContext) const override; - bool isEnabled(const SelectionContext &selectionContext) const override; - -private: - void addNewTab(); -}; - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.cpp b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.cpp deleted file mode 100644 index fe50799416c..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "addtabtotabviewdialog.h" -#include "ui_addtabtotabviewdialog.h" - -namespace QmlDesigner { - -AddTabToTabViewDialog::AddTabToTabViewDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AddTabToTabViewDialog) -{ - ui->setupUi(this); - ui->addTabLineEdit->setForceFirstCapitalLetter(true); -} - -AddTabToTabViewDialog::~AddTabToTabViewDialog() -{ - delete ui; -} - - -QString AddTabToTabViewDialog::create(const QString &tabName, QWidget *parent) -{ - AddTabToTabViewDialog addTabToTabViewDialog(parent); - - Utils::FileNameValidatingLineEdit *fileNameValidatingLineEdit = addTabToTabViewDialog.ui->addTabLineEdit; - - fileNameValidatingLineEdit->setText(tabName); - - int result = addTabToTabViewDialog.exec(); - - if (result == QDialog::Accepted && fileNameValidatingLineEdit->isValid()) - return fileNameValidatingLineEdit->text(); - else - return QString(); -} - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h deleted file mode 100644 index 9bb9eed8b7e..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace QmlDesigner { -namespace Ui { class AddTabToTabViewDialog; } - -class AddTabToTabViewDialog : public QDialog -{ - Q_OBJECT - -public: - explicit AddTabToTabViewDialog(QWidget *parent = nullptr); - ~AddTabToTabViewDialog() override; - - static QString create(const QString &tabName, QWidget *parent); - -private: - Ui::AddTabToTabViewDialog *ui; -}; - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.ui b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.ui deleted file mode 100644 index dff9e50e55c..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.ui +++ /dev/null @@ -1,85 +0,0 @@ - - - QmlDesigner::AddTabToTabViewDialog - - - - 0 - 0 - 362 - 80 - - - - Dialog - - - - - - - - Add tab: - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - Utils::FileNameValidatingLineEdit - QLineEdit -
utils/filenamevalidatinglineedit.h
- - - - - - buttonBox - accepted() - QmlDesigner::AddTabToTabViewDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - QmlDesigner::AddTabToTabViewDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp index 481a9ea7615..6c5ff54b74b 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp @@ -3,22 +3,12 @@ #include "componentsplugin.h" -#include "tabviewindexmodel.h" -#include "addtabdesigneraction.h" -#include "entertabdesigneraction.h" - -#include -#include #include namespace QmlDesigner { ComponentsPlugin::ComponentsPlugin() { - TabViewIndexModel::registerDeclarativeType(); - DesignerActionManager *actionManager = &QmlDesignerPlugin::instance()->viewManager().designerActionManager(); - actionManager->addDesignerAction(new AddTabDesignerAction); - actionManager->addDesignerAction(new EnterTabDesignerAction); } QString ComponentsPlugin::pluginName() const diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp deleted file mode 100644 index b04ee5f7c78..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "entertabdesigneraction.h" - -#include -#include -#include -#include -#include -#include - -#include - -namespace QmlDesigner { - -class EnterTabAction : public DefaultAction -{ - -public: - EnterTabAction(const QString &description) - : DefaultAction(description) - { } - -public: - void actionTriggered(bool) override - { - DocumentManager::goIntoComponent(m_selectionContext.targetNode()); - } -}; - -EnterTabDesignerAction::EnterTabDesignerAction() - : AbstractActionGroup(QCoreApplication::translate("TabViewToolAction", "Step into Tab")) -{ -} - -QByteArray EnterTabDesignerAction::category() const -{ - return QByteArray(); -} - -QByteArray EnterTabDesignerAction::menuId() const -{ - return "TabViewAction"; -} - -int EnterTabDesignerAction::priority() const -{ - //Editing tabs is above adding tabs - return CustomActionsPriority + 10; -} - -void EnterTabDesignerAction::updateContext() -{ - menu()->clear(); - if (selectionContext().isValid()) { - - action()->setEnabled(isEnabled(selectionContext())); - action()->setVisible(isVisible(selectionContext())); - - if (action()->isEnabled()) { - const ModelNode selectedModelNode = selectionContext().currentSingleSelectedNode(); - if (selectedModelNode.metaInfo().isValid() - && selectedModelNode.metaInfo().isQtQuickControlsTabView()) { - const NodeAbstractProperty defaultProperty = selectedModelNode - .defaultNodeAbstractProperty(); - const QList childModelNodes = defaultProperty.directSubNodes(); - for (const QmlDesigner::ModelNode &childModelNode : childModelNodes) { - createActionForTab(childModelNode); - } - } - } - } -} - -bool EnterTabDesignerAction::isVisible(const SelectionContext &selectionContext) const -{ - if (selectionContext.singleNodeIsSelected()) { - ModelNode selectedModelNode = selectionContext.currentSingleSelectedNode(); - return selectedModelNode.metaInfo().isQtQuickControlsTabView(); - } - - return false; -} - -static bool tabViewIsNotEmpty(const SelectionContext &selectionContext) -{ - return selectionContext.currentSingleSelectedNode().defaultNodeAbstractProperty().isNodeListProperty(); -} - -bool EnterTabDesignerAction::isEnabled(const SelectionContext &selectionContext) const -{ - return isVisible(selectionContext) && tabViewIsNotEmpty(selectionContext); -} - -void EnterTabDesignerAction::createActionForTab(const ModelNode &modelNode) -{ - if (modelNode.metaInfo().isQtQuickControlsTab()) { - QmlDesigner::QmlItemNode itemNode(modelNode); - - if (itemNode.isValid()) { - QString what = tr("Step into: %1"). - arg(itemNode.instanceValue("title").toString()); - auto selectionAction = new EnterTabAction(what); - - SelectionContext nodeSelectionContext = selectionContext(); - nodeSelectionContext.setTargetNode(modelNode); - selectionAction->setSelectionContext(nodeSelectionContext); - - menu()->addAction(selectionAction); - - } - } -} - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h deleted file mode 100644 index 3cb6adff0f6..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -#include - -namespace QmlDesigner { - -class EnterTabDesignerAction : public AbstractActionGroup -{ - Q_DECLARE_TR_FUNCTIONS(EnterTabDesignerAction) - -public: - EnterTabDesignerAction(); - - QByteArray category() const override; - QByteArray menuId() const override; - int priority() const override; - void updateContext() override; - -protected: - bool isVisible(const SelectionContext &selectionContext) const override; - bool isEnabled(const SelectionContext &selectionContext) const override; - -private: - void createActionForTab(const ModelNode &modelNode); -}; - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp deleted file mode 100644 index 65ca73483ad..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "tabviewindexmodel.h" - -#include -#include -#include - -TabViewIndexModel::TabViewIndexModel(QObject *parent) : - QObject(parent) -{ -} - -void TabViewIndexModel::setModelNodeBackend(const QVariant &modelNodeBackend) -{ - auto modelNodeBackendObject = modelNodeBackend.value(); - - if (modelNodeBackendObject) - setModelNode(modelNodeBackendObject->property("modelNode").value()); - - setupModel(); - emit modelNodeBackendChanged(); -} - -void TabViewIndexModel::setModelNode(const QmlDesigner::ModelNode &modelNode) -{ - m_modelNode = modelNode; -} - -QStringList TabViewIndexModel::tabViewIndexModel() const -{ - return m_tabViewIndexModel; -} - -void TabViewIndexModel::setupModel() -{ - m_tabViewIndexModel.clear(); - if (m_modelNode.metaInfo().isQtQuickControlsTabView()) { - const QList childModelNodes - = m_modelNode.defaultNodeAbstractProperty().directSubNodes(); - for (const QmlDesigner::ModelNode &childModelNode : childModelNodes) { - if (childModelNode.metaInfo().isQtQuickControlsTab()) { - QmlDesigner::QmlItemNode itemNode(childModelNode); - if (itemNode.isValid()) { - m_tabViewIndexModel.append(itemNode.instanceValue("title").toString()); - } - } - } - } -} - -void TabViewIndexModel::registerDeclarativeType() -{ - qmlRegisterType("HelperWidgets",2,0,"TabViewIndexModel"); -} - -QVariant TabViewIndexModel::modelNodeBackend() const -{ - return QVariant::fromValue(m_modelNode); -} diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h deleted file mode 100644 index bd1c5cfa6b8..00000000000 --- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -#include -#include - -class TabViewIndexModel : public QObject -{ - Q_OBJECT - Q_PROPERTY(QVariant modelNodeBackendProperty READ modelNodeBackend WRITE setModelNodeBackend NOTIFY modelNodeBackendChanged) - Q_PROPERTY(QStringList tabViewIndexModel READ tabViewIndexModel NOTIFY modelNodeBackendChanged) - -public: - explicit TabViewIndexModel(QObject *parent = nullptr); - - void setModelNodeBackend(const QVariant &modelNodeBackend); - void setModelNode(const QmlDesigner::ModelNode &modelNode); - QStringList tabViewIndexModel() const; - void setupModel(); - - static void registerDeclarativeType(); - -signals: - void modelNodeBackendChanged(); - -private: - QVariant modelNodeBackend() const; - - QmlDesigner::ModelNode m_modelNode; - QStringList m_tabViewIndexModel; - -}; - -QML_DECLARE_TYPE(TabViewIndexModel) diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index d7bc414e77e..c7d1e2a342f 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -145,9 +145,7 @@ public: bool isQtQuick3DView3D() const; bool isQtQuickBorderImage() const; bool isQtQuickControlsSwipeView() const; - bool isQtQuickControlsTab() const; bool isQtQuickControlsTabBar() const; - bool isQtQuickControlsTabView() const; bool isQtQuickExtrasPicture() const; bool isQtQuickImage() const; bool isQtQuickItem() const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index bdb7b63392e..7ca3aedff28 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -2107,16 +2107,6 @@ bool NodeMetaInfo::isListOrGridView() const } } -bool NodeMetaInfo::isQtQuickControlsTabView() const -{ - if constexpr (useProjectStorage()) { - using namespace Storage::Info; - return isBasedOnCommonType(m_projectStorage, m_typeId); - } else { - return isValid() && isSubclassOf("QtQuick.Controls.TabView"); - } -} - bool NodeMetaInfo::isQtQuickExtrasPicture() const { if constexpr (useProjectStorage()) { @@ -2195,17 +2185,6 @@ bool NodeMetaInfo::isQtQuickControlsTabBar() const } } -bool NodeMetaInfo::isQtQuickControlsTab() const -{ - if constexpr (useProjectStorage()) { - using namespace Storage::Info; - - return isBasedOnCommonType(m_projectStorage, m_typeId); - } else { - return isValid() && isSubclassOf("QtQuick.Controls.Tab"); - } -} - bool NodeMetaInfo::isQtQuickControlsSwipeView() const { if constexpr (useProjectStorage()) { diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 6d79375b6d7..2c990a50364 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -349,9 +349,6 @@ bool QmlItemNode::instanceHasScaleOrRotationTransform() const bool itemIsMovable(const ModelNode &modelNode) { - if (modelNode.metaInfo().isQtQuickControlsTab()) - return false; - if (!modelNode.hasParentProperty()) return false; @@ -363,9 +360,6 @@ bool itemIsMovable(const ModelNode &modelNode) bool itemIsResizable(const ModelNode &modelNode) { - if (modelNode.metaInfo().isQtQuickControlsTab()) - return false; - return NodeHints::fromModelNode(modelNode).isResizable(); } diff --git a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h index 0db44e3df76..05e90fdb285 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/commontypecache.h @@ -106,8 +106,6 @@ inline constexpr char StateGroup[] = "StateGroup"; inline constexpr char State[] = "State"; inline constexpr char SwipeView[] = "SwipeView"; inline constexpr char TabBar[] = "TabBar"; -inline constexpr char TabView[] = "TabView"; -inline constexpr char Tab[] = "Tab"; inline constexpr char TextArea[] = "TextArea"; inline constexpr char TextEdit[] = "TextEdit"; inline constexpr char Text[] = "Text"; @@ -215,9 +213,7 @@ class CommonTypeCache CacheType, CacheType, CacheType, - CacheType, CacheType, - CacheType, CacheType, CacheType, CacheType,