ios: single xcode and cleaned configurations

Use just one xcode, namely the one of xcode-select (like qmake)
cleaned iosconfigurations:
 * cleaned now unneded xcode paths
 * using static methods, removed IosConfig

Change-Id: Icc4d1bc1063a5f65230736a47b4ca9b139fa79e0
Reviewed-by: hjk <[email protected]>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 378cf43031e..d258d34991d 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -313,7 +313,7 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
         QString devStatus = info.value(devStatusKey);
         if (devStatus == QLatin1String("*off*")) {
             devManager->setDeviceState(newDev->id(), IDevice::DeviceConnected);
-            if (!newDev->m_ignoreDevice && !IosConfigurations::instance().config().ignoreAllDevices) {
+            if (!newDev->m_ignoreDevice && !IosConfigurations::ignoreAllDevices()) {
                 QMessageBox mBox;
                 mBox.setText(tr("An iOS device in user mode has been detected."));
                 mBox.setInformativeText(tr("Do you want to see how to set it up for development?"));
@@ -328,12 +328,8 @@ void IosDeviceManager::deviceInfo(IosToolHandler *, const QString &uid,
                     newDev->m_ignoreDevice = true;
                     break;
                 case QMessageBox::NoAll:
-                {
-                    IosConfig conf = IosConfigurations::instance().config();
-                    conf.ignoreAllDevices = true;
-                    IosConfigurations::instance().setConfig(conf);
+                    IosConfigurations::setIgnoreAllDevices(true);
                     break;
-                }
                 default:
                 break;
                 }