Merge tag '1.7.15' into develop

Finish 1.7.15

# Conflicts:
#	console/main.cpp

limereport/limereport.pri

@@ -237,3 +237,19 @@ FORMS += \
 RESOURCES += \
     $$REPORT_PATH/report.qrc \
     $$REPORT_PATH/items/items.qrc
+
+system("git --version") {
+    LR_VERSION = $$system("git --git-dir=$$PWD/../.git describe --tags --dirty")
+} else {
+    LR_VERSION = "0.0.0-unknown"
+}
+
+VERSION_TEMPLATE = $$PWD/version.h.in
+
+generateversion.depends = FORCE
+generateversion.input = VERSION_TEMPLATE
+generateversion.output = $$OUT_PWD/version.h
+generateversion.commands = $$QMAKE_STREAM_EDITOR \'s/@GIT_VERSION@/$$LR_VERSION/\' ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+generateversion.CONFIG = no_link target_predeps
+
+QMAKE_EXTRA_COMPILERS += generateversion

limereport/lraboutdialog.cpp

@@ -27,9 +27,7 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  ****************************************************************************/
-#ifdef CMAKE_CONFIG
-#include <config.h>
-#endif
+#include "version.h"
 #include "lraboutdialog.h"
 #include "ui_lraboutdialog.h"
 

limereport/version.h.in

@@ -0,0 +1,9 @@
+#pragma once
+
+// git will put "#define GIT_ARCHIVE 1" on the next line inside archives. $Format:%n#define GIT_ARCHIVE 1$
+
+#ifdef GIT_ARCHIVE
+#define LIMEREPORT_VERSION_STR "$Format:%(describe:tags=true)$"
+#else
+#define LIMEREPORT_VERSION_STR "@GIT_VERSION@"
+#endif