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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
This commit is contained in:
Eike Ziller
2012-09-11 14:02:03 +02:00
parent d09b83c28d fa094b2261
commit 5ac721dd58
156 changed files with 3503 additions and 3134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,18 +198,18 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
switch (kind) {
case Colon: enter(binding_assignment); break; // oops, was a binding
case Var:
case Identifier: enter(property_type); break;
case Identifier: enter(property_name); break;
case List: enter(property_list_open); break;
default: leave(true); continue;
} break;
case property_type:
case property_name:
turnInto(property_maybe_initializer);
break;
case property_list_open:
if (m_currentLine.midRef(m_currentToken.begin(), m_currentToken.length) == QLatin1String(">"))
turnInto(property_maybe_initializer);
turnInto(property_name);
break;
case property_maybe_initializer:
@@ -939,7 +939,7 @@ CodeFormatter::TokenKind CodeFormatter::extendedTokenKind(const QmlJS::Token &to
if (text == "on")
return On;
if (text == "list")
return On;
return List;
} else if (kind == Keyword) {
const QChar char1 = text.at(0);
const QChar char2 = text.at(1);

4
src/libs/qmljs/qmljscodeformatter.h
View File

@@ -110,9 +110,9 @@ public: // must be public to make Q_GADGET introspection work
property_start, // after 'property'
default_property_start, // after 'default'
property_type, // after first identifier
property_list_open, // after 'list' as a type
property_maybe_initializer, // after
property_name, // after the type
property_maybe_initializer, // after the identifier
signal_start, // after 'signal'
signal_maybe_arglist, // after identifier