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

Fixes for signals and complex script bindings.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-03-24 14:48:40 +01:00
parent a6ea34a2d5
commit fe1c4926de
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
View File

@@ -153,7 +153,11 @@ static inline bool isLiteralValue(UiScriptBinding *script)
if (!script || !script->statement) if (!script || !script->statement)
return false; return false;
return isLiteralValue((cast<ExpressionStatement *>(script->statement))->expression); ExpressionStatement *exprStmt = cast<ExpressionStatement *>(script->statement);
if (exprStmt)
return isLiteralValue(exprStmt->expression);
else
return false;
} }
static inline bool isValidPropertyForNode(const ModelNode &modelNode, static inline bool isValidPropertyForNode(const ModelNode &modelNode,
@@ -434,6 +438,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
} }
} }
} else if (UiPublicMember *property = cast<UiPublicMember *>(member)) { } else if (UiPublicMember *property = cast<UiPublicMember *>(member)) {
if (property->type == UiPublicMember::Signal)
continue; // QML designer doesn't support this yet.
if (!property->name || !property->memberType)
continue; // better safe than sorry.
const QString astName = property->name->asString(); const QString astName = property->name->asString();
QString astValue; QString astValue;
if (property->expression) if (property->expression)