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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
This commit is contained in:
Eike Ziller
2017-01-11 09:29:37 +01:00
parent fa84524c0c a8230eb6c1
commit b1f1ccb32e
39 changed files with 521 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/scxmleditor/plugin_interface/scxmltypes.h
View File

@@ -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 }
};