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

QmakeAndroidSupport: Replace AndroidQtSupport::extraLibraryEnabled

Browse Source 
... by base node functionality and inline it into its only user.

Change-Id: I39ba77c8a2e46b7f207fb62297b4665e213fb266
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-12-05 09:01:53 +01:00
parent 7915e47cff
commit 74723498cc
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/android/androidbuildapkwidget.cpp
View File

@@ -35,6 +35,8 @@
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
@@ -53,6 +55,8 @@
#include <algorithm> #include <algorithm>
using namespace ProjectExplorer;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
@@ -291,9 +295,10 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged, connect(m_extraLibraryListModel, &AndroidExtraLibraryListModel::enabledChanged,
additionalLibrariesGroupBox, &QWidget::setEnabled); additionalLibrariesGroupBox, &QWidget::setEnabled);
AndroidQtSupport *qtSupport = AndroidManager::androidQtSupport(m_step->target()); Target *target = m_step->target();
QTC_ASSERT(qtSupport, return); RunConfiguration *rc = target->activeRunConfiguration();
additionalLibrariesGroupBox->setEnabled(qtSupport->extraLibraryEnabled(m_step->target())); const ProjectNode *node = rc ? target->project()->findNodeForBuildKey(rc->buildKey()) : nullptr;
additionalLibrariesGroupBox->setEnabled(node && !node->parseInProgress());
} }
void AndroidBuildApkWidget::addAndroidExtraLib() void AndroidBuildApkWidget::addAndroidExtraLib()

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

@@ -67,8 +67,6 @@ public:
virtual bool setTargetData(Core::Id role, const QVariant &value, virtual bool setTargetData(Core::Id role, const QVariant &value,
const ProjectExplorer::Target *target) const = 0; const ProjectExplorer::Target *target) const = 0;
virtual bool extraLibraryEnabled(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

@@ -87,12 +87,6 @@ static QmakeProFile *applicationProFile(const Target *target)
return project->rootProFile()->findProFile(FileName::fromString(rc->buildKey())); return project->rootProFile()->findProFile(FileName::fromString(rc->buildKey()));
} }
bool QmakeAndroidSupport::extraLibraryEnabled(const Target *target) const
{
QmakeProFile *pro = applicationProFile(target);
return pro && !pro->parseInProgress();
}
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);

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

@@ -42,8 +42,6 @@ public:
bool setTargetData(Core::Id role, const QVariant &value, bool setTargetData(Core::Id role, const QVariant &value,
const ProjectExplorer::Target *target) const override; const ProjectExplorer::Target *target) const override;
bool extraLibraryEnabled(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;
}; };