From 8fbb44bd18b4150d01adfd5d9154368d5fc46160 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 7 Oct 2013 20:14:54 +0200 Subject: 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 --- src/plugins/ios/iosconfigurations.h | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'src/plugins/ios/iosconfigurations.h') diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h index 31ba3b251a..e068a7b8be 100644 --- a/src/plugins/ios/iosconfigurations.h +++ b/src/plugins/ios/iosconfigurations.h @@ -45,28 +45,16 @@ QT_END_NAMESPACE namespace Ios { namespace Internal { -class IosConfig -{ -public: - IosConfig(); - IosConfig(const QSettings &settings); - void save(QSettings &settings) const; - - Utils::FileName developerPath; - bool ignoreAllDevices; -}; - class IosConfigurations : public QObject { Q_OBJECT public: - static IosConfigurations &instance(); - IosConfig config() const { return m_config; } - void setConfig(const IosConfig &config); + static IosConfigurations *instance(); + static bool ignoreAllDevices(); + static void setIgnoreAllDevices(bool ignoreDevices); + static Utils::FileName developerPath(); - QStringList sdkTargets(); - void updateSimulators(); signals: void updated(); @@ -77,10 +65,12 @@ private: IosConfigurations(QObject *parent); void load(); void save(); + void updateSimulators(); + static void setDeveloperPath(const Utils::FileName &devPath); - static IosConfigurations *m_instance; - IosConfig m_config; QTimer m_updateAvailableDevices; + Utils::FileName m_developerPath; + bool m_ignoreAllDevices; }; } // namespace Internal -- cgit v1.2.1