feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ios: single xcode and cleaned configurations

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/ios/iosdevice.cpp
View File

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