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

Fix: build failure for qmljscheck an qmljscodeformatter

Browse Source 
Change-Id: Iba9686506d971f92e525361e93d648dc940fe2d2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
David Schulz
2012-11-28 15:07:58 +01:00
parent 4ba7309b73
commit 2db4fb4bea
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljscheck.cpp
View File

@@ -631,10 +631,10 @@ void Check::endVisit(UiObjectInitializer *)
m_propertyStack.pop(); m_propertyStack.pop();
m_typeStack.pop(); m_typeStack.pop();
UiObjectDefinition *objectDenition = cast<UiObjectDefinition *>(parent()); UiObjectDefinition *objectDenition = cast<UiObjectDefinition *>(parent());
if (objectDenition && objectDenition->qualifiedTypeNameId->name == "Component") if (objectDenition && objectDenition->qualifiedTypeNameId->name == QLatin1String("Component"))
m_idStack.pop(); m_idStack.pop();
UiObjectBinding *objectBinding = cast<UiObjectBinding *>(parent()); UiObjectBinding *objectBinding = cast<UiObjectBinding *>(parent());
if (objectBinding && objectBinding->qualifiedTypeNameId->name == "Component") if (objectBinding && objectBinding->qualifiedTypeNameId->name == QLatin1String("Component"))
m_idStack.pop(); m_idStack.pop();
} }

18
src/libs/qmljs/qmljscodeformatter.cpp
View File

@@ -927,17 +927,17 @@ CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &to
QStringRef text = m_currentLine.midRef(token.begin(), token.length); QStringRef text = m_currentLine.midRef(token.begin(), token.length);
if (kind == Identifier) { if (kind == Identifier) {
if (text == "as") if (text == QLatin1String("as"))
return As; return As;
if (text == "import") if (text == QLatin1String("import"))
return Import; return Import;
if (text == "signal") if (text == QLatin1String("signal"))
return Signal; return Signal;
if (text == "property") if (text == QLatin1String("property"))
return Property; return Property;
if (text == "on") if (text == QLatin1String("on"))
return On; return On;
if (text == "list") if (text == QLatin1String("list"))
return List; return List;
} else if (kind == Keyword) { } else if (kind == Keyword) {
const char char1 = text.at(0).toLatin1(); const char char1 = text.at(0).toLatin1();
@@ -998,11 +998,11 @@ CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &to
return Break; return Break;
} }
} else if (kind == Delimiter) { } else if (kind == Delimiter) {
if (text == "?") if (text == QLatin1String("?"))
return Question; return Question;
else if (text == "++") else if (text == QLatin1String("++"))
return PlusPlus; return PlusPlus;
else if (text == "--") else if (text == QLatin1String("--"))
return MinusMinus; return MinusMinus;
} }