diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-04-28 22:08:17 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2018-05-02 11:19:28 +0000 |
commit | dc982a13264273cdb532664c0184394da207793b (patch) | |
tree | b0f51b33671b05407a383f30f4b89db8281ba2e3 | |
parent | d7bd9c47e26b103c549e8882ac94ad81b2e27f11 (diff) | |
download | qt-creator-dc982a13264273cdb532664c0184394da207793b.tar.gz |
QmakeAndroid: Remove redundant function overrides
Change-Id: Ib019d1dc484e153f17c5ca0c03be08b1ed491e4e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
-rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp | 19 | ||||
-rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp index 5cf51f3443..362f63874c 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp @@ -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() { QmakeProject *project = qmakeProject(); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h index cffe847bf8..d23afb1514 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h @@ -45,8 +45,6 @@ public: private: QString disabledReason() const override; - bool fromMap(const QVariantMap &map) override; - QVariantMap toMap() const override; void updateDisplayName(); QmakeProjectManager::QmakeProject *qmakeProject() const; |