feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use ProjectStorage

Browse Source 
Task-number: QDS-7379
Change-Id: I50c8a4a527daa7268a723094b6ceec37d10dfaa6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marco Bubke
2022-08-23 16:43:44 +02:00
committed by Thomas Hartmann
parent 84e3ffeaba
commit 35a773b2dc
50 changed files with 741 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/components/bindingeditor/actioneditor.cpp
View File

@@ -195,6 +195,10 @@ void ActionEditor::prepareConnections()
constexpr auto typeWhiteList = std::make_tuple(
"string", "real", "int", "double", "bool", "QColor", "color", "QtQuick.Item", "QQuickItem");
auto isSkippedType = [](auto &&type) {
return !(type.isString() || type.isInteger() || type.isBool() || type.isColor()
|| type.isFloat() || type.isQmlItem());
};
static QList<PropertyName> methodBlackList({"toString", "destroy"});
QList<ActionEditorDialog::ConnectionOption> connections;
@@ -210,12 +214,12 @@ void ActionEditor::prepareConnections()
ActionEditorDialog::ConnectionOption connection(modelNode.id());
for (const auto &property : modelNode.metaInfo().properties()) {
if (!property.hasPropertyTypeName(typeWhiteList))
if (isSkippedType(property.propertyType()))
continue;
connection.properties.append(
ActionEditorDialog::PropertyOption(QString::fromUtf8(property.name()),
skipCpp(std::move(property.propertyTypeName())),
skipCpp(property.propertyType().typeName()),
property.isWritable()));
}
@@ -270,13 +274,13 @@ void ActionEditor::prepareConnections()
if (metaInfo.isValid()) {
ActionEditorDialog::SingletonOption singelton;
for (const auto &property : metaInfo.properties()) {
if (!property.hasPropertyTypeName(typeWhiteList))
if (isSkippedType(property.propertyType()))
continue;
singelton.properties.append(
ActionEditorDialog::PropertyOption(QString::fromUtf8(property.name()),
skipCpp(property.propertyTypeName()),
property.isWritable()));
singelton.properties.append(ActionEditorDialog::PropertyOption(
QString::fromUtf8(property.name()),
skipCpp(property.propertyType().typeName()),
property.isWritable()));
}
if (!singelton.properties.isEmpty()) {