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

QMakeAndroid: Replace QmakeAndroidSupport::projectFilePath

Browse Source 
... by existing base functionality.

Change-Id: I38bc25cba5f50b7694df73f57bec67a250ac9bdf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-12-04 15:49:47 +01:00
parent e9d3a9b1e8
commit 758db05c73
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidextralibrarylistmodel.cpp
View File

@@ -30,9 +30,12 @@
#include <android/androidmanager.h> #include <android/androidmanager.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
using namespace ProjectExplorer;
namespace Android { namespace Android {
AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(ProjectExplorer::Target *target, AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(ProjectExplorer::Target *target,
@@ -109,11 +112,16 @@ void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
{ {
AndroidQtSupport *qtSupport = Android::AndroidManager::androidQtSupport(m_target); AndroidQtSupport *qtSupport = Android::AndroidManager::androidQtSupport(m_target);
QTC_ASSERT(qtSupport, return); QTC_ASSERT(qtSupport, return);
Utils::FileName projectFilePath = qtSupport->projectFilePath(m_target);
RunConfiguration *rc = m_target->activeRunConfiguration();
QTC_ASSERT(rc, return);
const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
QTC_ASSERT(node, return);
beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size()); beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
const QDir dir = qtSupport->projectFilePath(m_target).toFileInfo().absoluteDir(); const QDir dir = node->filePath().toFileInfo().absoluteDir();
for (const QString &path : list) for (const QString &path : list)
m_entries += "$$PWD/" + dir.relativeFilePath(path); m_entries += "$$PWD/" + dir.relativeFilePath(path);

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

@@ -70,7 +70,6 @@ public:
virtual bool parseInProgress(const ProjectExplorer::Target *target) const = 0; virtual bool parseInProgress(const ProjectExplorer::Target *target) const = 0;
virtual bool validParse(const ProjectExplorer::Target *target) const = 0; virtual bool validParse(const ProjectExplorer::Target *target) const = 0;
virtual bool extraLibraryEnabled(const ProjectExplorer::Target *target) const = 0; virtual bool extraLibraryEnabled(const ProjectExplorer::Target *target) const = 0;
virtual Utils::FileName projectFilePath(const ProjectExplorer::Target *target) const = 0;
virtual void addFiles(const ProjectExplorer::Target *target, const QString &buildKey, virtual void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
const QStringList &addedFiles) const = 0; const QStringList &addedFiles) const = 0;

6
src/plugins/qmakeandroidsupport/qmakeandroidsupport.cpp
View File

@@ -105,12 +105,6 @@ bool QmakeAndroidSupport::extraLibraryEnabled(const Target *target) const
return pro && !pro->parseInProgress(); return pro && !pro->parseInProgress();
} }
FileName QmakeAndroidSupport::projectFilePath(const Target *target) const
{
QmakeProFile *pro = applicationProFile(target);
return pro ? pro->filePath() : FileName();
}
bool QmakeAndroidSupport::setTargetData(Core::Id role, const QVariant &value, const Target *target) const bool QmakeAndroidSupport::setTargetData(Core::Id role, const QVariant &value, const Target *target) const
{ {
QmakeProFile *pro = applicationProFile(target); QmakeProFile *pro = applicationProFile(target);

1
src/plugins/qmakeandroidsupport/qmakeandroidsupport.h
View File

@@ -45,7 +45,6 @@ public:
bool parseInProgress(const ProjectExplorer::Target *target) const override; bool parseInProgress(const ProjectExplorer::Target *target) const override;
bool validParse(const ProjectExplorer::Target *target) const override; bool validParse(const ProjectExplorer::Target *target) const override;
bool extraLibraryEnabled(const ProjectExplorer::Target *target) const override; bool extraLibraryEnabled(const ProjectExplorer::Target *target) const override;
Utils::FileName projectFilePath(const ProjectExplorer::Target *target) const override;
void addFiles(const ProjectExplorer::Target *target, const QString &buildKey, void addFiles(const ProjectExplorer::Target *target, const QString &buildKey,
const QStringList &addedFiles) const override; const QStringList &addedFiles) const override;