Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32

src/plugins/qmljseditor/qmljssemantichighlighter.cpp

@@ -265,6 +265,12 @@ protected:
         addUse(fullLocationForQualifiedId(localId), SemanticHighlighter::BindingNameType);
     }
 
+    bool visit(UiImport *ast)
+    {
+        processName(ast->importId, ast->importIdToken);
+        return true;
+    }
+
     bool visit(UiObjectDefinition *ast)
     {
         if (m_scopeChain.document()->bind()->isGroupedPropertyBinding(ast)) {