45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
--- installer-framework-everywhere-src-4.10/installerfw.pri.orig 2025-06-22 08:48:41.047103400 +0200
|
|
+++ installer-framework-everywhere-src-4.10/installerfw.pri 2025-06-22 08:50:56.972022700 +0200
|
|
@@ -154,13 +154,13 @@
|
|
|
|
DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER \
|
|
"_GIT_SHA1_=$$GIT_SHA1" \
|
|
- IFW_VERSION_STR=$$IFW_VERSION_STR \
|
|
- IFW_VERSION=$$IFW_VERSION \
|
|
- IFW_VERSION_STR_WIN32=$$IFW_VERSION_STR_WIN32 \
|
|
- IFW_VERSION_WIN32=$$IFW_VERSION_WIN32 \
|
|
- IFW_LIB_PATH=$$IFW_LIB_PATH
|
|
-DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION \
|
|
- IFW_CACHE_FORMAT_VERSION=$$IFW_CACHE_FORMAT_VERSION
|
|
+ IFW_VERSION_STR=\"$$IFW_VERSION_STR\" \
|
|
+ IFW_VERSION=\"$$IFW_VERSION\" \
|
|
+ IFW_VERSION_STR_WIN32=\"$$IFW_VERSION_STR_WIN32\" \
|
|
+ IFW_VERSION_WIN32=\"$$IFW_VERSION_WIN32\" \
|
|
+ IFW_LIB_PATH=\"$$IFW_LIB_PATH\"
|
|
+DEFINES += IFW_REPOSITORY_FORMAT_VERSION=\"$$IFW_REPOSITORY_FORMAT_VERSION\" \
|
|
+ IFW_CACHE_FORMAT_VERSION=\"$$IFW_CACHE_FORMAT_VERSION\"
|
|
|
|
win32-g++*: LIBS += -lmpr -luuid
|
|
|
|
--- a/src/sdk/installerbase.rc
|
|
+++ b/src/sdk/installerbase.rc
|
|
@@ -1,5 +1,9 @@
|
|
#include <windows.h>
|
|
|
|
+#define STRINGIFY_(x) #x
|
|
+#define STRINGIFY(x) STRINGIFY_(x)
|
|
+#define IFW_VERSION_STR_WIN32_M STRINGIFY(IFW_VERSION_STR_WIN32)
|
|
+
|
|
/* Version info for Windows binary */
|
|
VS_VERSION_INFO VERSIONINFO
|
|
FILEVERSION IFW_VERSION_WIN32
|
|
@@ -10,7 +14,7 @@
|
|
BEGIN
|
|
BLOCK "040904B0"
|
|
BEGIN
|
|
- VALUE "FileVersion", IFW_VERSION_STR_WIN32
|
|
+ VALUE "FileVersion", IFW_VERSION_STR_WIN32_M
|
|
END
|
|
END
|
|
END
|