diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-25 16:14:25 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-25 17:14:07 +0200 |
| commit | 83192865e70f32841729e72afebb84059470f9e6 (patch) | |
| tree | c74620f50da1958dc58f0b4d74dbdb428bafa905 /src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | |
| parent | fd547e4c5b575027ff758fbdb139cf6b58b1c0a2 (diff) | |
| download | qt-creator-83192865e70f32841729e72afebb84059470f9e6.tar.gz | |
Fix warnings on windows
Fix warnings on windows about overwriting virtual functions
Change-Id: I83e0262627faa4ce23624678de1b69f30624dc6a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index f7cf9d121e..8e7b97aff7 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -392,14 +392,14 @@ QList<Core::Id> S60DeployConfigurationFactory::availableCreationIds(Target *pare return result; } -QString S60DeployConfigurationFactory::displayNameForId(Core::Id id) const +QString S60DeployConfigurationFactory::displayNameForId(const Core::Id id) const { if (!pathFromId(id).isEmpty()) return tr("%1 on Symbian Device").arg(QFileInfo(pathFromId(id)).completeBaseName()); return QString(); } -DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, Core::Id id) +DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, const Core::Id id) { if (!canCreate(parent, id)) return 0; @@ -413,7 +413,7 @@ DeployConfiguration *S60DeployConfigurationFactory::create(Target *parent, Core: return dc; } -bool S60DeployConfigurationFactory::canCreate(Target *parent, Core::Id id) const +bool S60DeployConfigurationFactory::canCreate(Target *parent, const Core::Id id) const { Qt4SymbianTarget * t = qobject_cast<Qt4SymbianTarget *>(parent); if (!t || t->id() != Core::Id(Constants::S60_DEVICE_TARGET_ID) |