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

Android: Remove outdated condition

Browse Source 
Before e57ed31c33 the path was retrieved from
the root project node. In that commit this was changed and it is now read
from the Id.

Remove the argument and always read the path from id.

Also de-duplicate pathFromId.

Change-Id: I6aeef1106bc101ecb130f2c2ccb7226bfc7d0903
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Orgad Shaneh
2017-09-14 20:26:20 +03:00
committed by Orgad Shaneh
parent 98862af779
commit fb39de6a78
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,19 +49,19 @@ namespace Internal {
static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:"; static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
static QString pathFromId(const Core::Id id) static Utils::FileName pathFromId(const Core::Id id)
{ {
return id.suffixAfter(ANDROID_RC_ID_PREFIX); return Utils::FileName::fromString(id.suffixAfter(ANDROID_RC_ID_PREFIX));
} }
QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *target) QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *target)
: AndroidRunConfiguration(target) : AndroidRunConfiguration(target)
{} {}
void QmakeAndroidRunConfiguration::initialize(Core::Id id, const Utils::FileName &path) void QmakeAndroidRunConfiguration::initialize(Core::Id id)
{ {
AndroidRunConfiguration::initialize(id); AndroidRunConfiguration::initialize(id);
m_proFilePath = path; m_proFilePath = pathFromId(id);
ctor(); ctor();
} }
@@ -110,7 +110,7 @@ QString QmakeAndroidRunConfiguration::defaultDisplayName()
return node->displayName(); return node->displayName();
} }
return QFileInfo(pathFromId(id())).completeBaseName(); return displayNameForId(id());
} }
QString QmakeAndroidRunConfiguration::disabledReason() const QString QmakeAndroidRunConfiguration::disabledReason() const
@@ -129,6 +129,11 @@ QString QmakeAndroidRunConfiguration::buildSystemTarget() const
return qmakeProject()->mapProFilePathToTarget(m_proFilePath); return qmakeProject()->mapProFilePathToTarget(m_proFilePath);
} }
QString QmakeAndroidRunConfiguration::displayNameForId(Core::Id id)
{
return pathFromId(id).toFileInfo().completeBaseName();
}
QmakeProject *QmakeAndroidRunConfiguration::qmakeProject() const QmakeProject *QmakeAndroidRunConfiguration::qmakeProject() const
{ {
Target *t = target(); Target *t = target();

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

@@ -50,9 +50,11 @@ public:
QString buildSystemTarget() const final; QString buildSystemTarget() const final;
static QString displayNameForId(Core::Id id);
private: private:
friend class ProjectExplorer::IRunConfigurationFactory; friend class ProjectExplorer::IRunConfigurationFactory;
void initialize(Core::Id id, const Utils::FileName &path = Utils::FileName()); void initialize(Core::Id id);
void copyFrom(const QmakeAndroidRunConfiguration *source); void copyFrom(const QmakeAndroidRunConfiguration *source);
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;

9
src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
View File

@@ -46,11 +46,6 @@ namespace Internal {
static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:"; static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
static Utils::FileName pathFromId(const Core::Id id)
{
return Utils::FileName::fromString(id.suffixAfter(ANDROID_RC_ID_PREFIX));
}
QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject *parent) QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject *parent)
: IRunConfigurationFactory(parent) : IRunConfigurationFactory(parent)
{ {
@@ -58,7 +53,7 @@ QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject
QString QmakeAndroidRunConfigurationFactory::displayNameForId(Core::Id id) const QString QmakeAndroidRunConfigurationFactory::displayNameForId(Core::Id id) const
{ {
return pathFromId(id).toFileInfo().completeBaseName(); return QmakeAndroidRunConfiguration::displayNameForId(id);
} }
bool QmakeAndroidRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const bool QmakeAndroidRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
@@ -92,8 +87,6 @@ QList<Core::Id> QmakeAndroidRunConfigurationFactory::availableCreationIds(Target
RunConfiguration *QmakeAndroidRunConfigurationFactory::doCreate(Target *parent, Core::Id id) RunConfiguration *QmakeAndroidRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
{ {
if (parent->project()->rootProjectNode())
return createHelper<QmakeAndroidRunConfiguration>(parent, id, pathFromId(id));
return createHelper<QmakeAndroidRunConfiguration>(parent, id); return createHelper<QmakeAndroidRunConfiguration>(parent, id);
} }