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 <hjk121@nokiamail.com>
This commit is contained in:
Fawzi Mohamed
2013-10-07 20:14:54 +02:00
committed by hjk
parent 23673655bf
commit 8fbb44bd18
11 changed files with 87 additions and 173 deletions

View File

@@ -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