Merge remote-tracking branch 'origin/ios-package' into landing-silo

pull/1/head
Jenkins 2018-06-14 03:14:57 +02:00
commit a1817c4329
3 changed files with 57 additions and 3 deletions

View File

@ -59,8 +59,8 @@ QMAKE_EXTRA_TARGETS += osxbundle
# Translations support
TRANSLATIONS += $$files(mea/translations/*.ts, true)
lrelease.commands = lrelease $$_FILE_
lrelease-qmake_all.commands = lrelease $$_FILE_
TRANSLATIONS += $$files($$absolute_path(mea)/translations/*.ts, true)
lrelease.commands = lrelease $$TRANSLATIONS
lrelease-qmake_all.commands = lrelease $$TRANSLATIONS
QMAKE_EXTRA_TARGETS += lrelease lrelease-make_first lrelease-qmake_all lrelease-install_subtargets
mea.depends += lrelease

View File

@ -54,6 +54,19 @@ macx: {
ICON = ../packaging/osx/icon.icns
}
ios: {
message("iOS build")
QMAKE_TARGET_BUNDLE_PREFIX = io.guh
QMAKE_BUNDLE = mea
# Configure generated xcode project to have our bundle id
xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE}
plist.input = ../packaging/ios/Info.plist.in
plist.output = $$OUT_PWD/Info.plist
QMAKE_SUBSTITUTES += plist
QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
OTHER_FILES += ../packaging/ios/Info.plist.in
}
BR=$$BRANDING
!equals(BR, "") {
DEFINES += BRANDING=\\\"$${BR}\\\"

View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>mea</string>
<key>CFBundleExecutable</key>
<string>mea</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
<key>CFBundleIdentifier</key>
<string>io.guh.mea</string>
<key>CFBundleName</key>
<string>mea</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$$MEA_VERSION</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>10</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>