Qt version: Add base name of Qt folder to generated display name.

With some smartness to skip over bin, qtbase and display
usr as 'System'. Introduce BaseQtVersion::defaultDisplayName().

Change-Id: I5249bbd7102f40441e7a873d861c525e4194d74f
Reviewed-on: http://codereview.qt.nokia.com/43
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-05-20 15:52:58 +02:00
committed by Daniel Teske
parent 4773cdf7c0
commit a923cee383
3 changed files with 35 additions and 3 deletions

View File

@@ -374,7 +374,7 @@ void QtVersionManager::findSystemQt()
return;
BaseQtVersion *version = QtVersionFactory::createQtVersionFromQMakePath(systemQMakePath);
version->setDisplayName(tr("Qt in PATH (%1)").arg(version->qtVersionString()));
version->setDisplayName(BaseQtVersion::defaultDisplayName(version->qtVersionString(), systemQMakePath, true));
m_versions.insert(version->uniqueId(), version);
}