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

Symbian: Added QtMObility to the device info

Browse Source
This commit is contained in:
Pawel Polanski
2011-03-02 12:04:31 +01:00
parent 20f89b2df1
commit 35847fda82
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
View File

@@ -75,7 +75,8 @@ namespace Internal {
const char STARTING_DRIVE_LETTER = 'C'; const char STARTING_DRIVE_LETTER = 'C';
const char LAST_DRIVE_LETTER = 'Z'; const char LAST_DRIVE_LETTER = 'Z';
static const quint32 CODA_UID = 0x20021f96; static const quint32 CODA_UID = 0x20021F96;
static const quint32 QTMOBILITY_UID = 0x2002AC89;
QString formatDriveText(const S60DeployConfiguration::DeviceDrive &drive) QString formatDriveText(const S60DeployConfiguration::DeviceDrive &drive)
{ {
@@ -649,6 +650,7 @@ void S60DeployConfigurationWidget::updateDeviceInfo()
QList<quint32> packagesOfInterest; QList<quint32> packagesOfInterest;
packagesOfInterest.append(CODA_UID); packagesOfInterest.append(CODA_UID);
packagesOfInterest.append(QTMOBILITY_UID);
m_codaInfoDevice->sendSymbianInstallGetPackageInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getInstalledPackagesResult), packagesOfInterest); m_codaInfoDevice->sendSymbianInstallGetPackageInfoCommand(Coda::CodaCallback(this, &S60DeployConfigurationWidget::getInstalledPackagesResult), packagesOfInterest);
} }
@@ -662,16 +664,34 @@ void S60DeployConfigurationWidget::updateDeviceInfo()
QVariantList resultsList = result.values[0].toVariant().toList(); QVariantList resultsList = result.values[0].toVariant().toList();
foreach (const QVariant& var, resultsList) { foreach (const QVariant& var, resultsList) {
QVariantHash obj = var.toHash(); QVariantHash obj = var.toHash();
if (obj.value("uid").toString().toUInt(0, 16) == CODA_UID) { bool ok = false;
if (!obj.value("error").isNull()) { uint uid = obj.value("uid").toString().toUInt(&ok, 16);
if (ok) {
bool error = !obj.value("error").isNull();
QString versionString;
if (!error) {
QVariantList version = obj.value("version").toList();
versionString = QString("%1.%2.%3").arg(version[0].toInt())
.arg(version[1].toInt())
.arg(version[2].toInt());
}
switch (uid) {
case CODA_UID: {
if (error) {
// How can coda not be installed? Presumably some UID wrongness... // How can coda not be installed? Presumably some UID wrongness...
addErrorToTable(str, tr("CODA version: "), tr("Error reading CODA version")); addErrorToTable(str, tr("CODA version: "), tr("Error reading CODA version"));
} else { } else
QVariantList version = obj.value("version").toList(); addToTable(str, tr("CODA version: "), versionString);
addToTable(str, tr("CODA version:"), }
QString("%1.%2.%3").arg(version[0].toInt()) break;
.arg(version[1].toInt()) case QTMOBILITY_UID: {
.arg(version[2].toInt())); if (error)
addErrorToTable(str, tr("QtMobility version: "), tr("Error reading QtMobility version"));
else
addToTable(str, tr("QtMobility version: "), versionString);
}
break;
default: break;
} }
} }
} }