aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/connectioneditor/delegates.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmldesigner/components/connectioneditor/delegates.cpp')
-rw-r--r--src/plugins/qmldesigner/components/connectioneditor/delegates.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/connectioneditor/delegates.cpp b/src/plugins/qmldesigner/components/connectioneditor/delegates.cpp
index 7a308b0899..8107690cea 100644
--- a/src/plugins/qmldesigner/components/connectioneditor/delegates.cpp
+++ b/src/plugins/qmldesigner/components/connectioneditor/delegates.cpp
@@ -46,7 +46,7 @@ namespace Internal {
QStringList prependOnForSignalHandler(const QStringList &signalNames)
{
QStringList signalHandlerNames;
- foreach (const QString &signalName, signalNames) {
+ for (const QString &signalName : signalNames) {
QString signalHandlerName = signalName;
if (!signalHandlerName.isEmpty()) {
QChar firstChar = signalHandlerName.at(0).toUpper();
@@ -284,9 +284,19 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent, const QStyleOptionVie
switch (index.column()) {
case ConnectionModel::TargetModelNodeRow: {
- foreach (const ModelNode &modelNode, connectionModel->connectionView()->allModelNodes()) {
+ for (const ModelNode &modelNode : connectionModel->connectionView()->allModelNodes()) {
if (!modelNode.id().isEmpty()) {
connectionComboBox->addItem(modelNode.id());
+
+ for (const BindingProperty &property : modelNode.bindingProperties()) {
+ if (property.isValid()) {
+ if (property.isAlias()) {
+ connectionComboBox->addItem(modelNode.id()
+ + "."
+ + QString::fromUtf8(property.name()));
+ }
+ }
+ }
}
}
} break;
@@ -309,7 +319,7 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent, const QStyleOptionVie
}
QStringList trigger = connectionModel->getflowActionTriggerForRow(index.row());
- for (const QString action : trigger) {
+ for (const QString &action : trigger) {
connectionComboBox->addItem(tr("Activate FlowAction %1").arg(nameForAction(action)), action);
}
}