0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00

Merge tag '1.7.15' into develop

Finish 1.7.15

# Conflicts:
#	console/main.cpp
This commit is contained in:
Arin Alex
2024-09-19 20:19:50 +03:00
19 changed files with 2057 additions and 505 deletions

View File

@@ -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