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

Merge remote-tracking branch 'origin/2.8'

Browse Source
This commit is contained in:
Oswald Buddenhagen
2013-08-27 10:48:08 +02:00
parent 938151a0d7 393792956f
commit 4855871607
16 changed files with 7810 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

@@ -251,8 +251,12 @@ bool Highlighter::maybeQmlBuiltinType(const QStringRef &text) const
return true;
else if (ch == QLatin1Char('l') && text == QLatin1String("list"))
return true;
else if (ch == QLatin1Char('m') && text == QLatin1String("matrix4x4"))
return true;
else if (ch == QLatin1Char('p') && text == QLatin1String("point"))
return true;
else if (ch == QLatin1Char('q') && text == QLatin1String("quaternion"))
return true;
else if (ch == QLatin1Char('r') && text == QLatin1String("real"))
return true;
else if (ch == QLatin1Char('r') && text == QLatin1String("rect"))
@@ -269,8 +273,12 @@ bool Highlighter::maybeQmlBuiltinType(const QStringRef &text) const
return true;
else if (ch == QLatin1Char('v') && text == QLatin1String("var"))
return true;
else if (ch == QLatin1Char('v') && text == QLatin1String("vector2d"))
return true;
else if (ch == QLatin1Char('v') && text == QLatin1String("vector3d"))
return true;
else if (ch == QLatin1Char('v') && text == QLatin1String("vector4d"))
return true;
else
return false;
}