forked from qt-creator/qt-creator
Make method naming more consistent.
* Use id() for methods returning a string used to represent
some type of object.
* Use displayName() for strings that are meant to be user
visible.
* Quieten some warnings while touching the files anyway.
* Move Factories to their products in the plugins where that
was not done before.
Reviewed-by: dt
This commit is contained in:
@@ -183,12 +183,12 @@ void S60Manager::updateQtVersions()
|
||||
}
|
||||
if (deviceVersion) {
|
||||
deviceVersion->setQMakeCommand(qmakeFromQtDir(device.qt));
|
||||
deviceVersion->setName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
|
||||
deviceVersion->setDisplayName(QString("%1 (Qt %2)").arg(device.id, deviceVersion->qtVersionString()));
|
||||
handledVersions.append(deviceVersion);
|
||||
} else {
|
||||
deviceVersion = new QtVersion(QString("%1 (Qt %2)").arg(device.id), qmakeFromQtDir(device.qt),
|
||||
true, QString("%1.%2").arg(S60_AUTODETECTION_SOURCE, device.id));
|
||||
deviceVersion->setName(deviceVersion->name().arg(deviceVersion->qtVersionString()));
|
||||
deviceVersion->setDisplayName(deviceVersion->displayName().arg(deviceVersion->qtVersionString()));
|
||||
versionsToAdd.append(deviceVersion);
|
||||
}
|
||||
deviceVersion->setS60SDKDirectory(device.epocRoot);
|
||||
|
||||
Reference in New Issue
Block a user