Merge pull request #124 from phedlund/master

macOS fixes and changes
This commit is contained in:
martinrotter 2017-06-27 06:28:12 +02:00 committed by GitHub
commit 49ebd15f08
3 changed files with 805 additions and 782 deletions

2
resources/macosx/Info.plist.in Executable file → Normal file
View File

@ -19,7 +19,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>@EXECUTABLE@</string>
<string>@APP_NAME@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>

0
resources/text/CHANGELOG Executable file → Normal file
View File

View File

@ -91,7 +91,7 @@ isEmpty(PREFIX) {
}
mac {
PREFIX = $$OUT_PWD/$${APP_LOW_NAME}.app
PREFIX = $$quote($$OUT_PWD/$${APP_NAME}.app)
}
unix:!mac {
@ -742,9 +742,30 @@ unix:!mac {
}
mac {
IDENTIFIER = org.$${TARGET}.RSSGuard
CONFIG -= app_bundle
ICON = resources/macosx/$${TARGET}.icns
QMAKE_MAC_SDK = macosx10.12
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
target.path = $$quote($$PREFIX/Contents/MacOs/)
target.path = $$quote($$PREFIX/Contents/MacOS/)
# Install app icon.
icns_icon.files = resources/macosx/$${TARGET}.icns
icns_icon.path = $$quote($$PREFIX/Contents/Resources/)
# Install Info.plist.
info_plist.files = resources/macosx/Info.plist.in
info_plist.path = $$quote($$PREFIX/Contents/)
# Process the just installed Info.plist.
info_plist2.extra = @sed -e "s,@EXECUTABLE@,$$TARGET,g" -e "s,@SHORT_VERSION@,$$APP_VERSION,g" -e "s,@APP_NAME@,\"$$APP_NAME\",g" -e "s,@ICON@,$$basename(ICON),g" -e "s,@TYPEINFO@,"????",g" $$shell_quote($$PREFIX/Contents/Info.plist.in) > $$shell_quote($$PREFIX/Contents/Info.plist) && \
rm -f $$shell_quote($$PREFIX/Contents/Info.plist.in)
info_plist2.path = $$quote($$PREFIX/Contents/)
# Install PkgInfo
pkginfo.extra = @printf "APPL????" > $$shell_quote($$PREFIX/Contents/PkgInfo)
pkginfo.path = $$quote($$PREFIX/Contents/)
# Install SQL initializers.
misc_sql.files = resources/sql
@ -776,6 +797,8 @@ mac {
translations.files = $$OUT_PWD/translations
translations.path = $$quote($$PREFIX/Contents/Resources/)
INSTALLS += target misc_sql misc_icons faenza misc_feeds skins \
INSTALLS += target icns_icon info_plist info_plist2 pkginfo \
misc_sql misc_icons faenza misc_feeds skins \
misc_icon misc_plain_icon misc_texts translations
}