mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "f3aa53ce8a23ddccf1ca149514f1d876de55220d" and "d590b8aa3a3441735ff6adaa895cbe966c79de1c" have entirely different histories.
f3aa53ce8a
...
d590b8aa3a
161
appveyor.yml
161
appveyor.yml
|
@ -41,32 +41,6 @@ environment:
|
||||||
secure: RUhnEHqaR8KhalOMWwZZOoO342Ja50QV4KpEWdm9g3pG+jG7i6aJqUmeKF1l5VN6dzksk1u+yN6pOLnU8oGcaVQ6v+1dpKK1oZvF0tyHhNE=
|
secure: RUhnEHqaR8KhalOMWwZZOoO342Ja50QV4KpEWdm9g3pG+jG7i6aJqUmeKF1l5VN6dzksk1u+yN6pOLnU8oGcaVQ6v+1dpKK1oZvF0tyHhNE=
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
|
||||||
COMPILER: clang
|
|
||||||
QT: Qt/5.15/clang_64
|
|
||||||
QT_VERSION: Qt5_15
|
|
||||||
BUILD_SYSTEM: "qbs"
|
|
||||||
ARCH: x64
|
|
||||||
XCODE_VERSION: 14.1
|
|
||||||
PLATFORM: "macOS_10.13+"
|
|
||||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
|
||||||
MULTI_BUNDLE: true
|
|
||||||
DEPLOY: true
|
|
||||||
|
|
||||||
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
|
||||||
COMPILER: clang
|
|
||||||
QT: Qt/5.15/clang_64
|
|
||||||
QT_VERSION: Qt5_15
|
|
||||||
BUILD_SYSTEM: "qbs"
|
|
||||||
ARCH: x64
|
|
||||||
XCODE_VERSION: 14.1
|
|
||||||
PLATFORM: "macOS_10.13+"
|
|
||||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
|
||||||
MULTI_BUNDLE: false
|
|
||||||
DEPLOY: true
|
|
||||||
|
|
||||||
- job_name: MacOS_12_Qt_6_4 (multibundle)
|
- job_name: MacOS_12_Qt_6_4 (multibundle)
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||||
COMPILER: clang
|
COMPILER: clang
|
||||||
|
@ -74,7 +48,7 @@ environment:
|
||||||
QT_VERSION: Qt6
|
QT_VERSION: Qt6
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
XCODE_VERSION: 14.1
|
XCODE_VERSION: 13.4.1
|
||||||
PLATFORM: "macOS_11+"
|
PLATFORM: "macOS_11+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 11.0
|
MACOS_DEPLOYMENT_TARGET: 11.0
|
||||||
MULTI_BUNDLE: true
|
MULTI_BUNDLE: true
|
||||||
|
@ -87,12 +61,38 @@ environment:
|
||||||
QT_VERSION: Qt6
|
QT_VERSION: Qt6
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
XCODE_VERSION: 14.1
|
XCODE_VERSION: 13.4.1
|
||||||
PLATFORM: "macOS_11+"
|
PLATFORM: "macOS_11+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 11.0
|
MACOS_DEPLOYMENT_TARGET: 11.0
|
||||||
MULTI_BUNDLE: false
|
MULTI_BUNDLE: false
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
|
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
|
||||||
|
COMPILER: clang
|
||||||
|
QT: Qt/5.15/clang_64
|
||||||
|
QT_VERSION: Qt5_15
|
||||||
|
BUILD_SYSTEM: "qbs"
|
||||||
|
ARCH: x64
|
||||||
|
XCODE_VERSION: 12.3
|
||||||
|
PLATFORM: "macOS_10.13+"
|
||||||
|
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||||
|
MULTI_BUNDLE: true
|
||||||
|
DEPLOY: true
|
||||||
|
|
||||||
|
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
|
||||||
|
COMPILER: clang
|
||||||
|
QT: Qt/5.15/clang_64
|
||||||
|
QT_VERSION: Qt5_15
|
||||||
|
BUILD_SYSTEM: "qbs"
|
||||||
|
ARCH: x64
|
||||||
|
XCODE_VERSION: 12.3
|
||||||
|
PLATFORM: "macOS_10.13+"
|
||||||
|
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||||
|
MULTI_BUNDLE: false
|
||||||
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: Windows_Qt_6_5_(GCC_x64)
|
- job_name: Windows_Qt_6_5_(GCC_x64)
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
|
||||||
COMPILER: mingw
|
COMPILER: mingw
|
||||||
|
@ -187,7 +187,7 @@ environment:
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
QMAKE: qmake.exe
|
QMAKE: qmake.exe
|
||||||
ENABLE_PCH: true
|
ENABLE_PCH: true
|
||||||
MSVC_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.37.32822\\bin\\Hostx64\\x64"
|
MSVC_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.36.32532\\bin\\Hostx64\\x64"
|
||||||
VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
|
VSINSTALLDIR: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
PYTHON: "C:\\Python311-x64"
|
PYTHON: "C:\\Python311-x64"
|
||||||
|
@ -612,6 +612,7 @@ for:
|
||||||
- /Users/appveyor/cache_dir
|
- /Users/appveyor/cache_dir
|
||||||
|
|
||||||
init:
|
init:
|
||||||
|
- sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-vnc.sh' | bash -e -
|
||||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||||
|
@ -721,7 +722,7 @@ for:
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- clang --version
|
- clang --version
|
||||||
# Annoying clang issue: clang++ does not respect -isystem flag
|
# Annoying clang issue: clang++ does not respect -isystem flag
|
||||||
- rm /usr/local/include/xercesc || true
|
- rm /usr/local/include/xercesc
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- which qbs
|
- which qbs
|
||||||
|
@ -795,11 +796,9 @@ for:
|
||||||
secure: B8yHPBym+BTDPK5ZCg7WlSnUCHLbcim8WqLTC6/PSNs=
|
secure: B8yHPBym+BTDPK5ZCg7WlSnUCHLbcim8WqLTC6/PSNs=
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
#- /Users/appveyor/.conan/data -> conanfile.py
|
- /Users/appveyor/.conan/data -> conanfile.py
|
||||||
- /Users/appveyor/cache_dir
|
|
||||||
|
|
||||||
init:
|
init:
|
||||||
- sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-vnc.sh' | bash -e -
|
|
||||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||||
|
@ -849,100 +848,46 @@ for:
|
||||||
- sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
|
- sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
|
||||||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||||
- whereis python
|
- whereis python
|
||||||
- |-
|
|
||||||
|
|
||||||
###############################################################
|
|
||||||
# Set up macOS dependencies
|
|
||||||
|
|
||||||
sudo ln -s /usr/local /opt/local;
|
|
||||||
|
|
||||||
cache_tag=usr_local_1 # this can be modified to rebuild deps
|
|
||||||
|
|
||||||
cdir=$HOME/cache_dir
|
|
||||||
cache_tar=$cdir/$cache_tag.tar
|
|
||||||
cache=$cache_tar.xz
|
|
||||||
|
|
||||||
CPUS=$(sysctl -n hw.ncpu)
|
|
||||||
|
|
||||||
if [ -d $cdir ] && [ -f $cache ]; then
|
|
||||||
echo "=== Unpacking cached Homebrew $cache ==="
|
|
||||||
(
|
|
||||||
cd /
|
|
||||||
tar xf $cache
|
|
||||||
)
|
|
||||||
echo "done"
|
|
||||||
else
|
|
||||||
echo "=== Building dependencies ==="
|
|
||||||
echo "Couldn't find cache $cache"
|
|
||||||
ls -alrt "$cdir"
|
|
||||||
|
|
||||||
echo "Recording /usr/local state"
|
|
||||||
python3 ./scripts/treestate.py scan /usr/local usrlocal.json
|
|
||||||
|
|
||||||
brew update
|
|
||||||
brew install coreutils ccache git pkg-config qbs qt6 cmake ninja xerces-c
|
|
||||||
|
|
||||||
# The build environment is now ready for use. We can complete
|
|
||||||
# the rest of the process of creating the Homebrew archive
|
|
||||||
# during the rest of the build, using idle CPU time. To minimise
|
|
||||||
# the amount of space needed for the archive, we compress with
|
|
||||||
# xz, which adds only about a minute to the non-cached build.
|
|
||||||
(
|
|
||||||
echo "=== Creating cache tarball $cache ==="
|
|
||||||
echo "Check /usr/local for updates"
|
|
||||||
python3 ./scripts/treestate.py updates usrlocal.json /usr/local | fgrep -v .git > updated_list
|
|
||||||
echo Need to record $( wc -l updated_list ) updates
|
|
||||||
|
|
||||||
mkdir -p $cdir
|
|
||||||
rm -f $cdir/*
|
|
||||||
nice tar cf $cache_tar -T updated_list
|
|
||||||
echo nice xz -9 -T$CPUS $cache_tar
|
|
||||||
nice xz -9 -T$CPUS $cache_tar
|
|
||||||
du -h $cdir
|
|
||||||
) 2>&1 | sed 's/^/CACHE: /' &
|
|
||||||
|
|
||||||
fi
|
|
||||||
- sudo python3 -m pip install --upgrade pip
|
- sudo python3 -m pip install --upgrade pip
|
||||||
- pip3 install --user --upgrade pip dropbox 'urllib3<2.0'
|
- pip3 install --user --upgrade pip dropbox conan==1.61.0 'urllib3<2.0'
|
||||||
- export PATH="`brew --prefix qbs`/bin:$PATH"
|
- conan --version
|
||||||
- echo $PATH
|
|
||||||
- clang --version
|
- clang --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.1.2+.
|
|
||||||
- /usr/bin/curl https://gist.githubusercontent.com/dismine/43a20f66f563232e54e02f2e85732e7a/raw/e80a0c827348da3e99310ba4a648c1860bb3a8a6/BundleModule.qbs --output $HOME/BundleModule.qbs --silent
|
|
||||||
- cp -f $HOME/BundleModule.qbs $(brew --prefix qbs)/share/qbs/modules/bundle/BundleModule.qbs
|
|
||||||
- rm $HOME/BundleModule.qbs
|
|
||||||
- /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent
|
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
|
||||||
- cmake ${HOME}/macdeployqt-main -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- cmake --build ${HOME}/macdeployqt-build-dir --target install
|
|
||||||
# Clean /usr/local/include from Qt6
|
|
||||||
- find /usr/local/include -type l -name 'Qt*' > /tmp/qt_symlinks.txt
|
|
||||||
- cat /tmp/qt_symlinks.txt
|
|
||||||
- xargs -I {} unlink {} < /tmp/qt_symlinks.txt
|
|
||||||
- cd ${APPVEYOR_BUILD_FOLDER}
|
- cd ${APPVEYOR_BUILD_FOLDER}
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- pwd
|
- pwd
|
||||||
|
- conan profile new valentina
|
||||||
|
- conan profile update settings.build_type=Release valentina
|
||||||
|
- conan profile update settings.os=Macos valentina
|
||||||
|
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||||
|
- conan profile update settings.arch=x86_64 valentina
|
||||||
|
- conan profile update settings.compiler=apple-clang valentina
|
||||||
|
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||||
|
- conan profile update settings.compiler.version=14 valentina
|
||||||
|
- conan install . --build=missing -pr valentina
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
- qbs setup-qt ${QTDIR}/bin/qmake qt5
|
- qbs setup-qt ${QTDIR}/bin/qmake qt6
|
||||||
- qbs config defaultProfile qt5
|
- qbs config defaultProfile qt6
|
||||||
- qbs config profiles.qt5.baseProfile clang
|
- qbs config profiles.qt6.baseProfile clang
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt5 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:${QTDIR}/lib modules.macdeployqt.pluginspath:${QTDIR}/plugins modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt5 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:${QTDIR}/lib modules.macdeployqt.pluginspath:${QTDIR}/plugins modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
||||||
|
# notarytool supported since XCode 13. First we need to backport it.
|
||||||
|
- curl https://bitbucket.org/valentinaproject/valentinaproject.bitbucket.io/downloads/notarytool.tar.xz --output $HOME/notarytool.tar.xz --silent
|
||||||
|
- tar -xf $HOME/notarytool.tar.xz
|
||||||
# Store the notarization credentials so that we can prevent a UI password dialog
|
# Store the notarization credentials so that we can prevent a UI password dialog
|
||||||
# from blocking the CI
|
# from blocking the CI
|
||||||
- echo "Create keychain profile"
|
- echo "Create keychain profile"
|
||||||
- xcrun notarytool store-credentials "notarytool-profile" --apple-id "$MACOS_NOTARIZATION_APPLE_ID" --team-id "$MACOS_NOTARIZATION_TEAM_ID" --password "$MACOS_NOTARIZATION_PWD"
|
- $HOME/notarytool store-credentials "notarytool-profile" --apple-id "$MACOS_NOTARIZATION_APPLE_ID" --team-id "$MACOS_NOTARIZATION_TEAM_ID" --password "$MACOS_NOTARIZATION_PWD"
|
||||||
# Here we send the notarization request to the Apple's Notarization service, waiting for the result.
|
# Here we send the notarization request to the Apple's Notarization service, waiting for the result.
|
||||||
# This typically takes a few seconds inside a CI environment, but it might take more depending on the App
|
# This typically takes a few seconds inside a CI environment, but it might take more depending on the App
|
||||||
# characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
|
# characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
|
||||||
# you're curious
|
# you're curious
|
||||||
- echo "Notarize app"
|
- echo "Notarize app"
|
||||||
- xcrun notarytool submit "${APPVEYOR_BUILD_FOLDER}/build/install-root/share/valentina.dmg" --keychain-profile "notarytool-profile" --wait --timeout 5m
|
- $HOME/notarytool submit "${APPVEYOR_BUILD_FOLDER}/build/install-root/share/valentina.dmg" --keychain-profile "notarytool-profile" --wait --timeout 5m
|
||||||
# Finally, we need to "attach the staple" to our executable, which will allow our app to be
|
# Finally, we need to "attach the staple" to our executable, which will allow our app to be
|
||||||
# validated by macOS even when an internet connection is not available.
|
# validated by macOS even when an internet connection is not available.
|
||||||
- echo "Attach staple"
|
- echo "Attach staple"
|
||||||
|
|
13
dmg.qbs
13
dmg.qbs
|
@ -5,6 +5,9 @@ import qbs.Utilities
|
||||||
VAppleApplicationDiskImage {
|
VAppleApplicationDiskImage {
|
||||||
Depends { name: "buildconfig" }
|
Depends { name: "buildconfig" }
|
||||||
Depends { name: "ib" }
|
Depends { name: "ib" }
|
||||||
|
Depends { name: "Valentina"; }
|
||||||
|
Depends { name: "Tape"; condition: buildconfig.enableMultiBundle }
|
||||||
|
Depends { name: "Puzzle"; condition: buildconfig.enableMultiBundle }
|
||||||
|
|
||||||
condition: qbs.targetOS.contains("macos") && bundleProbe.ready
|
condition: qbs.targetOS.contains("macos") && bundleProbe.ready
|
||||||
name: "Valentina DMG"
|
name: "Valentina DMG"
|
||||||
|
@ -71,7 +74,6 @@ VAppleApplicationDiskImage {
|
||||||
// set to false to use a solid-color background (see dmg.backgroundColor below)
|
// set to false to use a solid-color background (see dmg.backgroundColor below)
|
||||||
property bool useImageBackground: true
|
property bool useImageBackground: true
|
||||||
Group {
|
Group {
|
||||||
name: "Background image"
|
|
||||||
condition: useImageBackground
|
condition: useImageBackground
|
||||||
files: {
|
files: {
|
||||||
if (buildconfig.enableMultiBundle)
|
if (buildconfig.enableMultiBundle)
|
||||||
|
@ -103,13 +105,8 @@ VAppleApplicationDiskImage {
|
||||||
return 576;
|
return 576;
|
||||||
}
|
}
|
||||||
|
|
||||||
dmg.windowHeight: 606
|
dmg.windowHeight: 600
|
||||||
dmg.iconSize: {
|
dmg.iconSize: 128
|
||||||
if (buildconfig.enableMultiBundle)
|
|
||||||
return 64;
|
|
||||||
|
|
||||||
return 128;
|
|
||||||
}
|
|
||||||
dmg.format: {
|
dmg.format: {
|
||||||
if (Qt.core.versionMajor >= 6)
|
if (Qt.core.versionMajor >= 6)
|
||||||
return "ULMO"; // macOS 10.15+ only
|
return "ULMO"; // macOS 10.15+ only
|
||||||
|
|
|
@ -32,8 +32,6 @@ Module {
|
||||||
|
|
||||||
property stringList libpath: undefined
|
property stringList libpath: undefined
|
||||||
|
|
||||||
property string pluginspath: undefined
|
|
||||||
|
|
||||||
property stringList targetApps: undefined
|
property stringList targetApps: undefined
|
||||||
|
|
||||||
property bool signForNotarization: false
|
property bool signForNotarization: false
|
||||||
|
@ -86,9 +84,6 @@ Module {
|
||||||
cmdArgs.push("-libpath=" + libpath);
|
cmdArgs.push("-libpath=" + libpath);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (product.macdeployqt.pluginspath !== undefined)
|
|
||||||
cmdArgs.push("-pluginspath=" + product.macdeployqt.pluginspath);
|
|
||||||
|
|
||||||
if (product.buildconfig.enableCodeSigning) {
|
if (product.buildconfig.enableCodeSigning) {
|
||||||
if (product.macdeployqt.signForNotarization)
|
if (product.macdeployqt.signForNotarization)
|
||||||
cmdArgs.push("-sign-for-notarization=" + product.macdeployqt.signingIdentity);
|
cmdArgs.push("-sign-for-notarization=" + product.macdeployqt.signingIdentity);
|
||||||
|
|
Loading…
Reference in a new issue