diff options
| author | con <qtc-committer@nokia.com> | 2010-12-08 10:57:21 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-12-08 10:57:21 +0100 |
| commit | 519b544f621100969a8e4fe68a8f397993ed0b4c (patch) | |
| tree | abdf538f607739d1828830e17407b64ac9c5652b /src/plugins/cpptools | |
| parent | f6a0c69106969d15299eda9adb88981a3bddf5a0 (diff) | |
| parent | bff0dd4a16aaffd248cdaad576bb27faa6ec74b3 (diff) | |
| download | qt-creator-519b544f621100969a8e4fe68a8f397993ed0b4c.tar.gz | |
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
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 3f1266ec87..81636c71b6 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/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) |