Commit 64182ab7 authored by armin's avatar armin
Browse files

Merge branch 'iosGalleryPickerPHAsset' into 'master'

Ios gallery picker ph asset

See merge request !193
parents 84dfe281 88f18278
Pipeline #727 passed with stage
in 1 minute and 21 seconds
Subproject commit 9e87ce6e41a9ec6dc24f8f48885cd4fd82bf583c
Subproject commit 026a42e136f6f1901a6ed74ea72987a5de55f186
......@@ -97,6 +97,7 @@ contains(ANDROID_TARGET_ARCH,armeabi-v8a) {
}
ios{
QT += gui-private
SOURCES += notifications/ios/applepushnotifications.cpp \
......@@ -135,11 +136,8 @@ ios{
QMAKE_INFO_PLIST = ios/Info.plist
ios_icon.files = $$files($$PWD/ios/icons/AppIcon*.png)
app_launch_images.files = $$PWD/ios/Launch.xib $$files($$PWD/ios/launch/LaunchImage*.png)
QMAKE_BUNDLE_DATA += app_launch_images
QMAKE_BUNDLE_DATA += ios_icon
MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
MY_ENTITLEMENTS.value = $$PWD/ios/fairchat.entitlements
......@@ -148,7 +146,7 @@ ios{
QMAKE_ASSET_CATALOGS = $$PWD/ios/Images.xcassets
QMAKE_ASSET_CATALOGS_APP_ICON = "Appicon"
QMAKE_IOS_DEPLOYMENT_TARGET = 12.0
QMAKE_IOS_DEPLOYMENT_TARGET = 10.0
QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1
PRODUCT_NAME = fairchat
#PRODUCT_BUNDLE_IDENTIFIER = com.osalliance.RocketChatMobile
......
......@@ -42,18 +42,6 @@
"filename" : "Icon-App-40x40@3x.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon-App-57x57@1x.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon-App-57x57@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
......@@ -149,34 +137,10 @@
"idiom" : "ios-marketing",
"filename" : "ItunesArtwork@2x.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@1x.png",
"scale" : "1x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-App-60x60@1x.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "iphone",
"filename" : "Icon-App-76x76@1x.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-App-76x76@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment