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

QmlDesigner: Signal declarations are always dynamic

Browse Source 
Change-Id: I5caf85462c13488c1d775563727c5ccaf9750e97
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2024-06-12 11:47:45 +02:00
parent 865c8687d9
commit 50501d7ab8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/connectioneditor/connectioneditorutils.cpp
View File

@@ -204,6 +204,7 @@ bool isBindingExpression(const QVariant &value)
return false; return false;
QRegularExpression regexp("^[a-zA-Z_]\\w*\\.{1}([a-z_]\\w*\\.?)+"); QRegularExpression regexp("^[a-zA-Z_]\\w*\\.{1}([a-z_]\\w*\\.?)+");
// QRegularExpression regexp("^[a-z_]\\w*|^[A-Z]\\w*\\.{1}([a-z_]\\w*\\.?)+");
QRegularExpressionMatch match = regexp.match(value.toString()); QRegularExpressionMatch match = regexp.match(value.toString());
return match.hasMatch(); return match.hasMatch();
} }
@@ -301,13 +302,16 @@ std::vector<PropertyMetaInfo> propertiesFromSingleton(const QString &name, Abstr
QList<AbstractProperty> dynamicPropertiesFromNode(const ModelNode &node) QList<AbstractProperty> dynamicPropertiesFromNode(const ModelNode &node)
{ {
auto isDynamic = [](const AbstractProperty &p) { return p.isDynamic(); }; auto isDynamic = [](const AbstractProperty &p) {
return p.isDynamic() || p.isSignalDeclarationProperty();
};
auto byName = [](const AbstractProperty &a, const AbstractProperty &b) { auto byName = [](const AbstractProperty &a, const AbstractProperty &b) {
return a.name() < b.name(); return a.name() < b.name();
}; };
QList<AbstractProperty> dynamicProperties = Utils::filtered(node.properties(), isDynamic); QList<AbstractProperty> dynamicProperties = Utils::filtered(node.properties(), isDynamic);
Utils::sort(dynamicProperties, byName); Utils::sort(dynamicProperties, byName);
return dynamicProperties; return dynamicProperties;
} }