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

Maemo: Disable proxy use for device access.

Browse Source 
Workaround for proxy problems on Windows (Qt bug?).

Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-09-27 17:28:38 +02:00
parent 9c0ff02d3d
commit f3ac8e43fe
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -175,7 +175,8 @@ private:
};
MaemoDeviceConfig::MaemoDeviceConfig(const QString &name, MaemoDeviceConfig::DeviceType devType)
: name(name),
: server(Core::SshConnectionParameters::NoProxy),
name(name),
type(devType),
portsSpec(defaultPortsSpec(type)),
internalId(MaemoDeviceConfigurations::instance().m_nextId++)
@@ -190,7 +191,8 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QString &name, MaemoDeviceConfig::Dev
MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
quint64 &nextId)
: name(settings.value(NameKey).toString()),
: server(Core::SshConnectionParameters::NoProxy),
name(settings.value(NameKey).toString()),
type(static_cast<DeviceType>(settings.value(TypeKey, DefaultDeviceType).toInt())),
portsSpec(settings.value(PortsSpecKey, defaultPortsSpec(type)).toString()),
internalId(settings.value(InternalIdKey, nextId).toULongLong())
@@ -209,7 +211,8 @@ MaemoDeviceConfig::MaemoDeviceConfig(const QSettings &settings,
}
MaemoDeviceConfig::MaemoDeviceConfig()
: name(QCoreApplication::translate("MaemoDeviceConfig", "(Invalid device)")),
: server(Core::SshConnectionParameters::NoProxy),
name(QCoreApplication::translate("MaemoDeviceConfig", "(Invalid device)")),
internalId(InvalidId)
{
}