From dc982a13264273cdb532664c0184394da207793b Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Sat, 28 Apr 2018 22:08:17 +0300
Subject: [PATCH] QmakeAndroid: Remove redundant function overrides

Change-Id: Ib019d1dc484e153f17c5ca0c03be08b1ed491e4e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 .../qmakeandroidrunconfiguration.cpp          | 19 -------------------
 .../qmakeandroidrunconfiguration.h            |  2 --
 2 files changed, 21 deletions(-)

diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
index 5cf51f34433..362f63874c8 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 cffe847bf89..d23afb1514e 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;