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

Android: Use the new Target::activeBuildKey() function

Browse Source 
Change-Id: I051874a2b44129740b2ecc19f7ff401663d8bf0a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-03-31 20:25:54 +02:00
parent f83347ec00
commit 553c3c2c74
5 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,8 @@
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h>
#include <utils/qtcassert.h>
using namespace ProjectExplorer;
namespace Android {
@@ -49,6 +51,7 @@ AndroidExtraLibraryListModel::AndroidExtraLibraryListModel(ProjectExplorer::Targ
this, &AndroidExtraLibraryListModel::updateModel);
connect(target, &Target::parsingFinished,
this, &AndroidExtraLibraryListModel::updateModel);
// Causes target()->activeBuildKey() result to change.
connect(target, &Target::activeRunConfigurationChanged,
this, &AndroidExtraLibraryListModel::updateModel);
}
@@ -83,10 +86,8 @@ QVariant AndroidExtraLibraryListModel::data(const QModelIndex &index, int role)
void AndroidExtraLibraryListModel::updateModel()
{
RunConfiguration *rc = m_target->activeRunConfiguration();
QTC_ASSERT(rc, return);
const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
const QString buildKey = m_target->activeBuildKey();
const ProjectNode *node = m_target->project()->findNodeForBuildKey(buildKey);
QTC_ASSERT(node, return);
if (node->parseInProgress()) {
@@ -111,10 +112,8 @@ void AndroidExtraLibraryListModel::updateModel()
void AndroidExtraLibraryListModel::addEntries(const QStringList &list)
{
RunConfiguration *rc = m_target->activeRunConfiguration();
QTC_ASSERT(rc, return);
const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
const QString buildKey = m_target->activeBuildKey();
const ProjectNode *node = m_target->project()->findNodeForBuildKey(buildKey);
QTC_ASSERT(node, return);
beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + list.size());
@@ -153,9 +152,8 @@ void AndroidExtraLibraryListModel::removeEntries(QModelIndexList list)
endRemoveRows();
}
RunConfiguration *rc = m_target->activeRunConfiguration();
QTC_ASSERT(rc, return);
const ProjectNode *node = m_target->project()->findNodeForBuildKey(rc->buildKey());
const QString buildKey = m_target->activeBuildKey();
const ProjectNode *node = m_target->project()->findNodeForBuildKey(buildKey);
QTC_ASSERT(node, return);
node->setData(Constants::AndroidExtraLibs, m_entries);
}