diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
| commit | b1f1ccb32ec31a1c4598e9fd22b23c1548a73299 (patch) | |
| tree | ca92d55857a1552cd926ca858b351a905608ed34 /src/plugins/scxmleditor | |
| parent | fa84524c0c9b93210e4151cf772375696d0080c6 (diff) | |
| parent | a8230eb6c1a45489f33ffa86498e5ea3452496e1 (diff) | |
| download | qt-creator-b1f1ccb32ec31a1c4598e9fd22b23c1548a73299.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/android/androidbuildapkstep.cpp
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
Diffstat (limited to 'src/plugins/scxmleditor')
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/scxmltypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h index e4179198aa..5b7e4738a0 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltypes.h +++ b/src/plugins/scxmleditor/plugin_interface/scxmltypes.h @@ -180,7 +180,7 @@ const scxmltag_attribute_t scxml_send_attributes[] = { { "type", nullptr, false, true, QVariant::String }, { "typeexpr", nullptr, false, true, QVariant::String }, { "id", nullptr, false, true, QVariant::String }, - { "idiocation", nullptr, false, true, QVariant::String }, + { "idlocation", nullptr, false, true, QVariant::String }, { "delay", nullptr, false, true, QVariant::String }, { "delayexpr", nullptr, false, true, QVariant::String }, { "namelist", nullptr, false, true, QVariant::String } @@ -197,7 +197,7 @@ const scxmltag_attribute_t scxml_invoke_attributes[] = { { "src", nullptr, false, true, QVariant::String }, { "srcexpr", nullptr, false, true, QVariant::String }, { "id", nullptr, false, true, QVariant::String }, - { "idiocation", nullptr, false, true, QVariant::String }, + { "idlocation", nullptr, false, true, QVariant::String }, { "namelist", nullptr, false, true, QVariant::String }, { "autoforward", ";true;false", false, true, QVariant::StringList } }; |