diff --git a/build_ios.sh b/build_ios.sh
index f2e1a497a701950cdba8b4bd7fcc4bec0cc0dcc2..3b2e01c2730ff7470d7985f5df739a42cefd9b79 100755
--- a/build_ios.sh
+++ b/build_ios.sh
@@ -14,6 +14,7 @@ mkdir -p ${SHADOW_BUILD_DIR} &&
cd ${SHADOW_BUILD_DIR} &&
#-- Create project only (build using Xcode)
${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore
+rsync -av ${TRAVIS_BUILD_DIR}/ios/Images.xcassets ${SHADOW_BUILD_DIR}/QGroundControl/
#-- Create and build
#${QMAKE} -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=WarningsAsErrorsOn CONFIG-=debug_and_release CONFIG+=release CONFIG+=ForAppStore &&
#xcodebuild -configuration Release -xcconfig ${TRAVIS_BUILD_DIR}/ios/qgroundcontrol_appstore.xcconfig
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png
new file mode 100644
index 0000000000000000000000000000000000000000..be15514c8cf56e2e144083f29a05b0fc32c1e3b9
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c88419121fc2ee845fa49f2b8681c431e6b3fbd1
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef033eea3ecefc62127ed4bb4b327a78befe131f
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..f45170234c63abf82fb53a9947dc51117d22b6bb
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2977c664f6882b8b02a08d57d2357ed56660c1e5
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..044f7cc8b6db50a71ec263150f3accaaca161231
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x~ipad.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png b/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..3628aa976d66fc26aed83fa08225cbc771fa7626
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/AppIcon76x76~ipad.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..001862ca607db142d82ece9d374e440e2cf4f1c8
--- /dev/null
+++ b/ios/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+ "images" : [
+ {
+ "size" : "20x20",
+ "idiom" : "iphone",
+ "filename" : "Icon-41.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "20x20",
+ "idiom" : "iphone",
+ "filename" : "Icon-60.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "AppIcon29x29@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "iphone",
+ "filename" : "Icon-87.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "AppIcon40x40@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "Icon-120.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "AppIcon60x60@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "Icon-180.png",
+ "scale" : "3x"
+ },
+ {
+ "size" : "20x20",
+ "idiom" : "ipad",
+ "filename" : "Icon-20.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "20x20",
+ "idiom" : "ipad",
+ "filename" : "Icon-40.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "AppIcon29x29.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "29x29",
+ "idiom" : "ipad",
+ "filename" : "AppIcon29x29@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "AppIcon40x40~ipad.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "40x40",
+ "idiom" : "ipad",
+ "filename" : "AppIcon40x40@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "AppIcon76x76~ipad.png",
+ "scale" : "1x"
+ },
+ {
+ "size" : "76x76",
+ "idiom" : "ipad",
+ "filename" : "AppIcon76x76@2x~ipad.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "83.5x83.5",
+ "idiom" : "ipad",
+ "filename" : "Icon-167.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "1024x1024",
+ "idiom" : "ios-marketing",
+ "filename" : "Icon-1024.png",
+ "scale" : "1x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e9cba219773e96827a93afe14026e76c4dc405b
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-1024.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-120.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3c3af7cbe9c48a03bd04ce3cb4dc23c37db0f3e
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-120.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-167.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-167.png
new file mode 100644
index 0000000000000000000000000000000000000000..1393b32d3f2473afa6df43145946e686ea6eb51c
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-167.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-180.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce1a454da59bfd18980b214078669ffe9b9a47e3
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-180.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d04911cf5abe864809cb4425014af3f8935e096
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
new file mode 100644
index 0000000000000000000000000000000000000000..9debb9302d9121c49d9deb6403b32f5fd6abd356
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-41.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-41.png
new file mode 100644
index 0000000000000000000000000000000000000000..9debb9302d9121c49d9deb6403b32f5fd6abd356
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-41.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-60.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cbec4ddb3ef60aaaf285bb1710bb7829155cc97
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-60.png differ
diff --git a/ios/Images.xcassets/AppIcon.appiconset/Icon-87.png b/ios/Images.xcassets/AppIcon.appiconset/Icon-87.png
new file mode 100644
index 0000000000000000000000000000000000000000..2aeaa73875675034aee7b1dde5397b7b10740d17
Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/Icon-87.png differ
diff --git a/ios/Images.xcassets/Contents.json b/ios/Images.xcassets/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..da4a164c918651cdd1e11dca5cc62c333f097601
--- /dev/null
+++ b/ios/Images.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Contents.json b/ios/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..e737326cd7c35edb4c2fa8e2fc7864d101926473
--- /dev/null
+++ b/ios/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,168 @@
+{
+ "images" : [
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "2436h",
+ "filename" : "Default1125x2436.png",
+ "minimum-system-version" : "11.0",
+ "orientation" : "portrait",
+ "scale" : "3x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "2436h",
+ "filename" : "Default2436x1125.png",
+ "minimum-system-version" : "11.0",
+ "orientation" : "landscape",
+ "scale" : "3x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "tv",
+ "filename" : "Default3840x2160.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "11.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "tv",
+ "filename" : "Default1920x1080.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "9.0",
+ "scale" : "1x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "736h",
+ "filename" : "Default1242x2208.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "3x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "736h",
+ "filename" : "Default2208x1242.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "landscape",
+ "scale" : "3x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "667h",
+ "filename" : "Default750x1334.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "Default640x960.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "retina4",
+ "filename" : "Default640x1136.png",
+ "minimum-system-version" : "7.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "filename" : "Default768x1024.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "filename" : "Default1024x768.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "filename" : "Default1536x2048.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "filename" : "Default2048x1536.png",
+ "extent" : "full-screen",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "Default320x480.png",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "Default640x960.png",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "filename" : "Default640x1136.png",
+ "extent" : "full-screen",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "filename" : "Default768x1024.png",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "filename" : "Default1024x768.png",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "filename" : "Default1536x2048.png",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "landscape",
+ "idiom" : "ipad",
+ "filename" : "Default2048x1536.png",
+ "extent" : "full-screen",
+ "scale" : "2x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png
new file mode 100644
index 0000000000000000000000000000000000000000..778c14401915fe2cd293e1cb112f6db61ca83239
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default1024x768.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe1113776793a2ea2f685cb11d00d074b56a3ed
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default1125x2436.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png
new file mode 100644
index 0000000000000000000000000000000000000000..601b256675569c379c7fa268b74092ff666fa8d3
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default1242x2208.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png
new file mode 100644
index 0000000000000000000000000000000000000000..68151c2685d53721c079977b2ae20f88ba64c8b8
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default1536x2048.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png b/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png
new file mode 100644
index 0000000000000000000000000000000000000000..21b35a1a8551be7934ba673a6deddde909694b81
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default1920x1080.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png
new file mode 100644
index 0000000000000000000000000000000000000000..50efd7a2feba3a44d547c607a9c8f3c636a1fdca
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default2048x1536.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png
new file mode 100644
index 0000000000000000000000000000000000000000..61e79279e3eb26ad78961f0e9d3c9aeefb549bd2
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default2208x1242.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png b/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png
new file mode 100644
index 0000000000000000000000000000000000000000..25f71a05d664fc08c9c8e1aa800140419a691415
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default2436x1125.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png b/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f59f02b5876601f63716809137215ebae7a20e5
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default320x480.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png b/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png
new file mode 100644
index 0000000000000000000000000000000000000000..4634a8381aa3d1f7001ee35d7109a4801de4fd13
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default3840x2160.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png
new file mode 100644
index 0000000000000000000000000000000000000000..458e9b258c33d7c039fec9503ed98f4a2f6b3206
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default640x1136.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png b/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png
new file mode 100644
index 0000000000000000000000000000000000000000..c033ad24f3108e1418a966d9944428d2e667cca1
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default640x960.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png b/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png
new file mode 100644
index 0000000000000000000000000000000000000000..00a12c53a0351edfa29f391cd9bedc71df6050ad
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default750x1334.png differ
diff --git a/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png b/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b2a088f59445fa0e53128cf302e2df6ef631ff
Binary files /dev/null and b/ios/Images.xcassets/LaunchImage.launchimage/Default768x1024.png differ
diff --git a/ios/iOSForAppStore-Info-Source.plist b/ios/iOSForAppStore-Info-Source.plist
index de8c15ec7a3cf9955a5b701bfe2cd2450ce407aa..9baabdbec2a9b81ac3e1c5bb2de1f94a7361d6ca 100644
--- a/ios/iOSForAppStore-Info-Source.plist
+++ b/ios/iOSForAppStore-Info-Source.plist
@@ -83,6 +83,8 @@
Ground Station Location
NSLocationWhenInUseUsageDescription
Ground Station Location
+ NSLocationAlwaysAndWhenInUseUsageDescription
+ Ground Station Location
UILaunchStoryboardName
QGCLaunchScreen
NSBluetoothPeripheralUsageDescription
diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml
index 231ac6946b9f31168bed52dd711cb2f82679b2af..bcf2f9ecfc1221078a33a3fa7445356304b75fa3 100644
--- a/src/QmlControls/ScreenTools.qml
+++ b/src/QmlControls/ScreenTools.qml
@@ -54,7 +54,7 @@ Item {
readonly property real largeFontPointRatio: 1.5
property real realPixelDensity: QGroundControl.corePlugin.options.devicePixelDensity != 0 ? QGroundControl.corePlugin.options.devicePixelDensity : Screen.pixelDensity
- property real realPixelRatio: QGroundControl.corePlugin.options.devicePixelRatio != 0 ? QGroundControl.corePlugin.options.devicePixelRatio : Screen.devicePixelRatio
+ property real realPixelRatio: isiOS ? 1 : (QGroundControl.corePlugin.options.devicePixelRatio != 0 ? QGroundControl.corePlugin.options.devicePixelRatio : Screen.devicePixelRatio)
property bool isAndroid: ScreenToolsController.isAndroid
property bool isiOS: ScreenToolsController.isiOS
diff --git a/src/VideoStreaming/VideoStreaming.cc b/src/VideoStreaming/VideoStreaming.cc
index 9fe2e0d96eb4e63992d4d7f5974d2446df5abccc..87dd76d7303dd837463b00d26ae5ebf0498e059e 100644
--- a/src/VideoStreaming/VideoStreaming.cc
+++ b/src/VideoStreaming/VideoStreaming.cc
@@ -120,8 +120,8 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
qgcputenv("GST_PLUGIN_PATH", currentDir, "/gstreamer-plugins");
#endif
-
// Initialize GStreamer
+#if !defined(__ios__)
if (logpath) {
if (debuglevel) {
qputenv("GST_DEBUG", debuglevel);
@@ -130,9 +130,8 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
qputenv("GST_DEBUG_FILE", QString("%1/%2").arg(logpath).arg("gstreamer-log.txt").toUtf8());
qputenv("GST_DEBUG_DUMP_DOT_DIR", logpath);
}
-
-
- GError* error = NULL;
+#endif
+ GError* error = nullptr;
if (!gst_init_check(&argc, &argv, &error)) {
qCritical() << "gst_init_check() failed: " << error->message;
g_error_free(error);