From 33438efc98148e15926a2d303585155b69bd5bb0 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Mon, 11 Nov 2013 14:39:18 +0100
Subject: [PATCH] ProfileHighlighting: Sort keywords correctly

Task-number: QTCREATORBUG-10622
Change-Id: I96a68627eb4fad37526f43519ede929e727b4908
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
---
 .../profilecompletionassist.cpp               | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
index 1c822c239ed..42371bc5b09 100644
--- a/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
+++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.cpp
@@ -48,7 +48,6 @@ static const char *const variableKeywords[] = {
     "DESTDIR_TARGET",
     "DISTFILES",
     "DLLDESTDIR",
-    "DISTFILES",
     "DSP_TEMPLATE",
     "FORMS",
     "FORMS3",
@@ -72,12 +71,12 @@ static const char *const variableKeywords[] = {
     "OBJECTS_DIR",
     "OBJMOC",
     "OTHER_FILES",
+    "OUT_PWD",
     "PKGCONFIG",
     "POST_TARGETDEPS",
-    "PRE_TARGETDEPS",
     "PRECOMPILED_HEADER",
+    "PRE_TARGETDEPS",
     "PWD",
-    "OUT_PWD",
     "QMAKE",
     "QMAKESPEC",
     "QMAKE_APP_FLAG",
@@ -111,16 +110,16 @@ static const char *const variableKeywords[] = {
     "QMAKE_CXXFLAGS_WARN_ON",
     "QMAKE_DISTCLEAN",
     "QMAKE_EXTENSION_SHLIB",
-    "QMAKE_EXT_MOC",
-    "QMAKE_EXT_UI",
-    "QMAKE_EXT_PRL",
-    "QMAKE_EXT_LEX",
-    "QMAKE_EXT_YACC",
-    "QMAKE_EXT_OBJ",
-    "QMAKE_EXT_CPP",
-    "QMAKE_EXT_H",
     "QMAKE_EXTRA_COMPILERS",
     "QMAKE_EXTRA_TARGETS",
+    "QMAKE_EXT_CPP",
+    "QMAKE_EXT_H",
+    "QMAKE_EXT_LEX",
+    "QMAKE_EXT_MOC",
+    "QMAKE_EXT_OBJ",
+    "QMAKE_EXT_PRL",
+    "QMAKE_EXT_UI",
+    "QMAKE_EXT_YACC",
     "QMAKE_FAILED_REQUIREMENTS",
     "QMAKE_FRAMEWORK_BUNDLE_NAME",
     "QMAKE_FRAMEWORK_VERSION",
@@ -139,9 +138,9 @@ static const char *const variableKeywords[] = {
     "QMAKE_LFLAGS_CONSOLE_DLL",
     "QMAKE_LFLAGS_DEBUG",
     "QMAKE_LFLAGS_PLUGIN",
-    "QMAKE_LFLAGS_RPATH",
     "QMAKE_LFLAGS_QT_DLL",
     "QMAKE_LFLAGS_RELEASE",
+    "QMAKE_LFLAGS_RPATH",
     "QMAKE_LFLAGS_SHAPP",
     "QMAKE_LFLAGS_SHLIB",
     "QMAKE_LFLAGS_SONAME",
@@ -149,8 +148,8 @@ static const char *const variableKeywords[] = {
     "QMAKE_LFLAGS_WINDOWS",
     "QMAKE_LFLAGS_WINDOWS_DLL",
     "QMAKE_LIBDIR",
-    "QMAKE_LIBDIR_FLAGS",
     "QMAKE_LIBDIR_EGL",
+    "QMAKE_LIBDIR_FLAGS",
     "QMAKE_LIBDIR_OPENGL",
     "QMAKE_LIBDIR_OPENVG",
     "QMAKE_LIBDIR_QT",
@@ -159,9 +158,9 @@ static const char *const variableKeywords[] = {
     "QMAKE_LIBS_CONSOLE",
     "QMAKE_LIBS_EGL",
     "QMAKE_LIBS_OPENGL",
-    "QMAKE_LIBS_OPENGL_QT",
     "QMAKE_LIBS_OPENGL_ES1",
     "QMAKE_LIBS_OPENGL_ES2",
+    "QMAKE_LIBS_OPENGL_QT",
     "QMAKE_LIBS_OPENVG",
     "QMAKE_LIBS_QT",
     "QMAKE_LIBS_QT_DLL",
@@ -176,13 +175,13 @@ static const char *const variableKeywords[] = {
     "QMAKE_LIB_FLAG",
     "QMAKE_LINK_SHLIB_CMD",
     "QMAKE_LN_SHLIB",
+    "QMAKE_MACOSX_DEPLOYMENT_TARGET",
+    "QMAKE_MAC_SDK",
+    "QMAKE_MAKEFILE",
+    "QMAKE_MOC_SRC",
     "QMAKE_POST_LINK",
     "QMAKE_PRE_LINK",
     "QMAKE_PROJECT_NAME",
-    "QMAKE_MAC_SDK",
-    "QMAKE_MACOSX_DEPLOYMENT_TARGET",
-    "QMAKE_MAKEFILE",
-    "QMAKE_MOC_SRC",
     "QMAKE_QMAKE",
     "QMAKE_QT_DLL",
     "QMAKE_RESOURCE_FLAGS",
@@ -196,10 +195,10 @@ static const char *const variableKeywords[] = {
     "QMAKE_UIC",
     "QT",
     "QTPLUGIN",
-    "QT_VERSION",
     "QT_MAJOR_VERSION",
     "QT_MINOR_VERSION",
     "QT_PATCH_VERSION",
+    "QT_VERSION",
     "RCC_DIR",
     "RC_FILE",
     "REQUIRES",
@@ -219,10 +218,10 @@ static const char *const variableKeywords[] = {
     "UI_DIR",
     "UI_HEADERS_DIR",
     "UI_SOURCES_DIR",
+    "VERSION",
     "VER_MAJ",
     "VER_MIN",
     "VER_PAT",
-    "VERSION",
     "VPATH",
     "YACCIMPLS",
     "YACCOBJECTS",