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

QmakeAndroid: Remove redundant function overrides

Browse Source 
Change-Id: Ib019d1dc484e153f17c5ca0c03be08b1ed491e4e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Orgad Shaneh
2018-04-28 22:08:17 +03:00
committed by Orgad Shaneh
parent d7bd9c47e2
commit dc982a1326
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
View File

@@ -58,25 +58,6 @@ QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *target, Core:
}); });
} }
bool QmakeAndroidRunConfiguration::fromMap(const QVariantMap &map)
{
if (!AndroidRunConfiguration::fromMap(map))
return false;
return true;
}
QVariantMap QmakeAndroidRunConfiguration::toMap() const
{
QVariantMap map(AndroidRunConfiguration::toMap());
// FIXME: Remove, only left for compatibility in 4.7 development cycle.
const QDir projectDir = QDir(target()->project()->projectDirectory().toString());
map.insert(PRO_FILE_KEY, projectDir.relativeFilePath(proFilePath().toString()));
return map;
}
void QmakeAndroidRunConfiguration::updateDisplayName() void QmakeAndroidRunConfiguration::updateDisplayName()
{ {
QmakeProject *project = qmakeProject(); QmakeProject *project = qmakeProject();

2
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
View File

@@ -45,8 +45,6 @@ public:
private: private:
QString disabledReason() const override; QString disabledReason() const override;
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
void updateDisplayName(); void updateDisplayName();
QmakeProjectManager::QmakeProject *qmakeProject() const; QmakeProjectManager::QmakeProject *qmakeProject() const;