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

Android: Remove AndroidRunConfiguration::disabledReason()

Browse Source 
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>
This commit is contained in:
hjk
2019-02-22 12:39:13 +01:00
parent c255562fec
commit cc5e8b7c75
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androidrunconfiguration.cpp
View File

@@ -155,22 +155,4 @@ void AndroidRunConfiguration::updateTargetInformation()
setDefaultDisplayName(bti.displayName); 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 } // namespace Android

1
src/plugins/android/androidrunconfiguration.h
View File

@@ -68,7 +68,6 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig
public: public:
explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id); explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
QString disabledReason() const override;
QWidget *createConfigurationWidget() override; QWidget *createConfigurationWidget() override;
private: private: