Merge remote branch 'origin/2.1'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp

src/plugins/cpptools/cppcodecompletion.cpp

@@ -1126,11 +1126,9 @@ void CppCodeCompletion::globalCompletion(Scope *currentScope)
         completeNamespace(b);
 
     addKeywords();
-    addSnippets();
-    qStableSort(m_completions.begin(), m_completions.end(), completionItemLessThan);
-
     addMacros(QLatin1String("<configuration>"), context.snapshot());
     addMacros(context.thisDocument()->fileName(), context.snapshot());
+    addSnippets();
 }
 
 static Scope *enclosingNonTemplateScope(Symbol *symbol)