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

QmakeAndroidSupport: Access parseInProgress and validParse

Browse Source 
... via base project node functionality.

Change-Id: Ifd9c5b149e11c1d104abed200881fdfe93749144
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-12-04 16:04:09 +01:00
parent 612410e1f9
commit 42f5c8516a
7 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,21 +85,27 @@ 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());
QTC_ASSERT(node, return);
AndroidQtSupport *qtSupport = Android::AndroidManager::androidQtSupport(m_target);
QTC_ASSERT(qtSupport, return);
if (qtSupport->parseInProgress(m_target)) {
if (node->parseInProgress()) {
emit enabledChanged(false);
return;
}
bool enabled;
beginResetModel();
if (qtSupport->validParse(m_target)) {
if (node->validParse()) {
m_entries = qtSupport->targetData(Constants::AndroidExtraLibs, m_target).toStringList();
enabled = true;
} else {
// parsing error or not a application template
// parsing error
m_entries.clear();
enabled = false;
}