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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Change-Id: I7d1912cd5c4d824fd40d3454c5f1bb796f2c21d8
This commit is contained in:
Orgad Shaneh
2019-04-07 20:40:29 +03:00
parent a33386e014 5273ef2a8a
commit 39ba01da71
92 changed files with 1153 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qmljs/qmljsreformatter.cpp
View File

@@ -921,12 +921,11 @@ protected:
bool visit(PatternElement *ast) override
{
if (!ast->isVariableDeclaration())
return false;
out(ast->identifierToken);
if (ast->initializer) {
out(" = ");
if (ast->isVariableDeclaration())
out(" = ");
accept(ast->initializer);
}
return false;

2
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -232,7 +232,7 @@ void TypeDescriptionReader::readComponent(UiObjectDefinition *ast)
} else if (name == QLatin1String("exports")) {
readExports(script, fmo);
} else if (name == QLatin1String("exportMetaObjectRevisions")) {
//readMetaObjectRevisions(script, fmo);
readMetaObjectRevisions(script, fmo);
} else if (name == QLatin1String("attachedType")) {
fmo->setAttachedTypeName(readStringBinding(script));
} else if (name == QLatin1String("isSingleton")) {