From 601fc38f06b1f9d75e60755b9fbdc1e374363663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9B=D1=83=D1=85?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 08:03:38 +0300 Subject: [PATCH] Fix qmake version generator cmake's `execute_process()` has `WORKING_DIRECTORY` parameter, but qmake's `$$system()` does not. As a workaround for qmake, `git` command was called with `--git-dir` provided explicitly. But for dirtyness detection we need `--work-tree`, too. Follow-up for https://github.com/fralx/LimeReport/pull/471#issuecomment-2362114994 --- limereport/limereport.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limereport/limereport.pri b/limereport/limereport.pri index 0243cb9..8efae19 100644 --- a/limereport/limereport.pri +++ b/limereport/limereport.pri @@ -215,7 +215,7 @@ RESOURCES += \ $$REPORT_PATH/items/items.qrc system("git --version") { - LR_VERSION = $$system("git --git-dir=$$PWD/../.git describe --tags --dirty") + LR_VERSION = $$system("git --git-dir=$$PWD/../.git --work-tree=$$PWD/.. describe --tags --dirty") } else { LR_VERSION = "0.0.0-unknown" }