Merge pull request #2960 from DonLakeFlyer/iOSFixes

iOS fixes

QGCCommon.pri

@@ -74,9 +74,8 @@ linux {
     CONFIG += iOSBuild MobileBuild app_bundle
     DEFINES += __ios__
     QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
-    QMAKE_IOS_TARGETED_DEVICE_FAMILY = 2 #- iPad only for now
+    QMAKE_IOS_TARGETED_DEVICE_FAMILY = 1,2 # Universal
     QMAKE_LFLAGS += -Wl,-no_pie
-    warning("iOS build is experimental and not yet fully functional")
 } else {
     error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported")
 }

src/comm/LinkManager.cc

@@ -89,9 +89,11 @@ LinkManager::LinkManager(QGCApplication* app)
     _autoconnect3DRRadio =  settings.value(_autoconnect3DRRadioKey, true).toBool();
     _autoconnectPX4Flow =   settings.value(_autoconnectPX4FlowKey, true).toBool();
 
+#ifndef __ios__
     _activeLinkCheckTimer.setInterval(_activeLinkCheckTimeoutMSecs);
     _activeLinkCheckTimer.setSingleShot(false);
     connect(&_activeLinkCheckTimer, &QTimer::timeout, this, &LinkManager::_activeLinkCheck);
+#endif
 }
 
 LinkManager::~LinkManager()
@@ -849,6 +851,7 @@ bool LinkManager::isBluetoothAvailable(void)
     return qgcApp()->isBluetoothAvailable();
 }
 
+#ifndef __ios__
 void LinkManager::_activeLinkCheck(void)
 {
     SerialLink* link = NULL;
@@ -892,3 +895,4 @@ void LinkManager::_activeLinkCheck(void)
                                   QStringLiteral("Your Vehicle is not responding. If this continues shutdown QGroundControl, restart the Vehicle letting it boot completely, then start QGroundControl."));
     }
 }
+#endif

src/comm/LinkManager.h

@@ -202,7 +202,9 @@ signals:
 private slots:
     void _linkConnected(void);
     void _linkDisconnected(void);
+#ifndef __ios__
     void _activeLinkCheck(void);
+#endif
 
 private:
     bool _connectionsSuspendedMsg(void);
@@ -236,9 +238,11 @@ private:
     bool _autoconnect3DRRadio;
     bool _autoconnectPX4Flow;
 
+#ifndef __ios__
     QTimer              _activeLinkCheckTimer;                  ///< Timer which checks for a vehicle showing up on a usb direct link
     QList<SerialLink*>  _activeLinkCheckList;                   ///< List of links we are waiting for a vehicle to show up on
     static const int    _activeLinkCheckTimeoutMSecs = 15000;   ///< Amount of time to wait for a heatbeat. Keep in mind ArduPilot stack heartbeat is slow to come.
+#endif
 
     static const char*  _settingsGroup;
     static const char*  _autoconnectUDPKey;