From 53650d6223300ceafb222992971b9a031c2d7589 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 25 Jan 2023 08:09:45 -0800 Subject: [PATCH] Building Info.plist file. --- qbs/imports/VToolApp.qbs | 10 ++++------ qbs/modules/buildconfig/buildconfig.qbs | 3 +++ src/app/puzzle/puzzle.pro | 2 ++ src/app/puzzle/puzzle.qbs | 9 +++++++++ src/app/tape/tape.pro | 2 ++ src/app/tape/tape.qbs | 9 +++++++++ src/app/valentina/valentina.pro | 2 ++ src/app/valentina/valentina.qbs | 9 +++++++++ 8 files changed, 40 insertions(+), 6 deletions(-) diff --git a/qbs/imports/VToolApp.qbs b/qbs/imports/VToolApp.qbs index ae61d1858..7ff11f60e 100644 --- a/qbs/imports/VToolApp.qbs +++ b/qbs/imports/VToolApp.qbs @@ -14,13 +14,11 @@ VApp { installDebugInformation: true consoleApplication: false bundle.isBundle: qbs.buildVariant === "release" + bundle.identifierPrefix: 'ua.com.smart-pattern' - Properties { - // Breakpoints do not work if debug the app inside of bundle. In debug mode we turn off creating a bundle. - // Probably it will breake some dependencies. Version for Mac designed to work inside an app bundle. - condition: qbs.targetOS.contains("macos") && qbs.buildVariant == "debug" - bundle.isBundle: false - } + bundle.infoPlist:({ + "NSHumanReadableCopyright": buildconfig.valentina_copyright_string + }) Properties { condition: buildconfig.enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") diff --git a/qbs/modules/buildconfig/buildconfig.qbs b/qbs/modules/buildconfig/buildconfig.qbs index fea2a7c0b..f2cc396f0 100644 --- a/qbs/modules/buildconfig/buildconfig.qbs +++ b/qbs/modules/buildconfig/buildconfig.qbs @@ -22,6 +22,9 @@ Module { property bool enableAppImage: false + property string valentina_copyright_year: { return new Date().getFullYear().toString(); } + property string valentina_copyright_string: "(C) 2013-" + valentina_copyright_year + ", Valentina project" + Depends { name: "ccache"; } // Use this property to disable the use of ccache. diff --git a/src/app/puzzle/puzzle.pro b/src/app/puzzle/puzzle.pro index 10ed4c8be..e8ae65c9a 100644 --- a/src/app/puzzle/puzzle.pro +++ b/src/app/puzzle/puzzle.pro @@ -12,6 +12,8 @@ QT += core gui widgets network xml svg xmlpatterns printsupport concurrent # Name of binary file TARGET = puzzle +VERSION = 0.7.52 + # We want create executable file TEMPLATE = app diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 765196700..fa780109c 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -272,4 +272,13 @@ VToolApp { qbs.install: true qbs.installDir: buildconfig.installAppPath } + + Group { + name: "MacOS assets" + condition: qbs.targetOS.contains("macos") + prefix: project.sourceDirectory + "/dist/macx/puzzle/" + files: [ + "Info.plist" + ] + } } diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 6e6017317..3cae65453 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -12,6 +12,8 @@ QT += core gui widgets network xml xmlpatterns printsupport svg concurrent # Name of binary file TARGET = tape +VERSION = 0.7.52 + # We want create executable file TEMPLATE = app diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index 6ebe298a7..3eccd2744 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -217,4 +217,13 @@ VToolApp { qbs.install: true qbs.installDir: buildconfig.installAppPath } + + Group { + name: "MacOS assets" + condition: qbs.targetOS.contains("macos") + prefix: project.sourceDirectory + "/dist/macx/tape/" + files: [ + "Info.plist" + ] + } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index c27b3581d..8492b5a65 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -28,6 +28,8 @@ macx{ TARGET = valentina } +VERSION = 0.7.52 + # Use out-of-source builds (shadow builds) CONFIG -= debug_and_release debug_and_release_target diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 5a922362e..2640b5187 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -310,4 +310,13 @@ VToolApp { prefix: product.sourceDirectory + "/share/resources/" files: "valentina.rc" } + + Group { + name: "MacOS assets" + condition: qbs.targetOS.contains("macos") + prefix: project.sourceDirectory + "/dist/macx/valentina/" + files: [ + "Info.plist" + ] + } }