From 2b0ed30806b34315962da382cb41edf5f19b231e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 25 Nov 2023 14:22:24 +0100 Subject: [PATCH 1/2] Add installation to PREFIX on mac when set This allows the app to be shipped in a non-bundeled version We need this to ship the app on macOS with nix --- QLog.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/QLog.pro b/QLog.pro index db6686f1..576bfe1d 100644 --- a/QLog.pro +++ b/QLog.pro @@ -386,6 +386,12 @@ macx: { equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain DISTFILES += + + # This allows the app to be shipped in a non-bundeled version + !isEmpty(PREFIX) { + target.path = $$PREFIX + INSTALLS += target + } } win32: { From 5751f987c294e71c9ec2172843a737813654144c Mon Sep 17 00:00:00 2001 From: Ladislav Foldyna Date: Sat, 25 Nov 2023 16:46:45 +0100 Subject: [PATCH 2/2] Reordered Mac Prefix code in pro-file --- QLog.pro | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/QLog.pro b/QLog.pro index 576bfe1d..7811565f 100644 --- a/QLog.pro +++ b/QLog.pro @@ -381,17 +381,17 @@ unix:!macx { } macx: { + # This allows the app to be shipped in a non-bundeled version + !isEmpty(PREFIX) { + target.path = $$PREFIX + INSTALLS += target + } + INCLUDEPATH += /usr/local/include LIBS += /usr/local/lib -lhamlib equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain DISTFILES += - - # This allows the app to be shipped in a non-bundeled version - !isEmpty(PREFIX) { - target.path = $$PREFIX - INSTALLS += target - } } win32: {