generate context_help and function_help in the same order

qgis · Jun 20, 2014 · 8cd467b · 8cd467b
1 parent 8cccdc5
commit 8cd467b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py
@@ -335,8 +335,8 @@ def openModel(self):
                 self.hasChanged = False
             except WrongModelException, e:
                 QMessageBox.critical(self, self.tr('Could not open model'),
-                        self.tr('The selected model could not be loaded.\n\
-                                 Wrong line: %s') % e.msg)
+                        self.tr('The selected model could not be loaded.\n'
+                                'Wrong line: %s') % e.msg)
 
     def repaintModel(self):
         self.scene = ModelerScene()

diff --git a/resources/context_help/CMakeLists.txt b/resources/context_help/CMakeLists.txt
@@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgscontexthelp_texts.cpp")
 
 FILE(WRITE ${HELP_OUTPUT} "#include \"qgscontexthelp.h\"\n#include <QCoreApplication>\n\nQHash<QString, QString> QgsContextHelp::gContextHelpTexts;\n\nvoid QgsContextHelp::init()\n{\n  if( !gContextHelpTexts.isEmpty() )\n    return;\n")
 
+LIST(SORT HELP_FILES)
+
 FOREACH(HELP_FILE ${HELP_FILES})
   STRING(REGEX REPLACE "^.*/([^/]+)$" "\\1" CONTEXT ${HELP_FILE})
 

diff --git a/resources/function_help/CMakeLists.txt b/resources/function_help/CMakeLists.txt
@@ -5,6 +5,8 @@ SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgsexpression_texts.cpp")
 
 FILE(WRITE ${HELP_OUTPUT} "#include \"qgsexpression.h\"\n#include <QCoreApplication>\n\nQHash<QString, QString> QgsExpression::gFunctionHelpTexts;\n\nvoid QgsExpression::initFunctionHelp()\n{\n  if( !gFunctionHelpTexts.isEmpty() )\n    return;\n")
 
+LIST(SORT HELP_FILES)
+
 FOREACH(HELP_FILE ${HELP_FILES})
   STRING(REGEX REPLACE "^.*/([^/]+)$" "\\1" FN ${HELP_FILE})