Mark the trailing whitespaces.

src/libs/qmljs/qmljshighlighter.cpp

@@ -189,11 +189,11 @@ void QScriptHighlighter::highlightBlock(const QString &text)
         previousTokenEnd = token.end();
     }
 
+    setFormat(previousTokenEnd, text.length() - previousTokenEnd, m_formats[VisualWhitespace]);
+
     int firstNonSpace = 0;
-    if (! tokens.isEmpty()) {
-        const Token &tk = tokens.first();
-        firstNonSpace = tk.offset;
-    }
+    if (! tokens.isEmpty())
+        firstNonSpace = tokens.first().offset;
 
     setCurrentBlockState(m_scanner.endState());
     onBlockEnd(m_scanner.endState(), firstNonSpace);

src/plugins/qmljseditor/qmlhighlighter.cpp

@@ -41,6 +41,7 @@ QmlHighlighter::QmlHighlighter(QTextDocument *parent) :
     m_braceDepth = 0;
 
     QSet<QString> qmlKeywords(keywords());
+    qmlKeywords << QLatin1String("alias");
     qmlKeywords << QLatin1String("property");
     qmlKeywords << QLatin1String("signal");
     qmlKeywords << QLatin1String("readonly");