diff options
author | hjk <hjk@qt.io> | 2019-02-22 12:39:13 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-02-22 13:10:08 +0000 |
commit | cc5e8b7c756a30836523bf9e9c06bfd40fbe3d61 (patch) | |
tree | baa09c2b9919775f08b9f8b72c944260fa5cc874 | |
parent | c255562fec3b27c49b436c3678b9d64ba72b54d8 (diff) | |
download | qt-creator-cc5e8b7c756a30836523bf9e9c06bfd40fbe3d61.tar.gz |
Android: Remove AndroidRunConfiguration::disabledReason()
The formerly handled special case of a missing project file is
now handled by the base implementation.
Change-Id: Ib3f7d295395b5c406acbd8bdd578fd7190b34dae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/android/androidrunconfiguration.cpp | 18 | ||||
-rw-r--r-- | src/plugins/android/androidrunconfiguration.h | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index 1f16851fff..06f9f548c6 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -155,22 +155,4 @@ void AndroidRunConfiguration::updateTargetInformation() setDefaultDisplayName(bti.displayName); } -QString AndroidRunConfiguration::disabledReason() const -{ - const BuildTargetInfo bti = buildTargetInfo(); - const QString projectFileName = bti.projectFilePath.toString(); - - if (project()->isParsing()) - return tr("The project file \"%1\" is currently being parsed.").arg(projectFileName); - - if (!project()->hasParsingData()) { - if (!bti.projectFilePath.exists()) - return tr("The project file \"%1\" does not exist.").arg(projectFileName); - - return tr("The project file \"%1\" could not be parsed.").arg(projectFileName); - } - - return QString(); -} - } // namespace Android diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index bc6e10b90c..6723048f37 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -68,7 +68,6 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig public: explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id); - QString disabledReason() const override; QWidget *createConfigurationWidget() override; private: |