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

ProjectExplorer: Use an alias for QList<Abi>

Browse Source 
Change-Id: I69231c5974620ae30296bfc4e0ab41c900d95a3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-27 11:04:18 +02:00
parent 98c4994c38
commit 2ac89cba92
30 changed files with 89 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidconfigurations.cpp
View File

@@ -951,7 +951,7 @@ static QVariant findOrRegisterDebugger(ToolChain *tc)
// check if the debugger is already registered, but ignoring the display name
const Debugger::DebuggerItem *existing = Debugger::DebuggerItemManager::findByCommand(command);
if (existing && existing->engineType() == Debugger::GdbEngineType && existing->isAutoDetected()
&& existing->abis() == QList<Abi>{tc->targetAbi()})
&& existing->abis() == Abis{tc->targetAbi()})
return existing->id();
// debugger not found, register a new one
Debugger::DebuggerItem debugger;
@@ -997,7 +997,7 @@ void AndroidConfigurations::updateAutomaticKitList()
return v->type() == Constants::ANDROIDQT;
});
for (const QtSupport::BaseQtVersion *qtVersion : qtVersions) {
const QList<Abi> qtAbis = qtVersion->qtAbis();
const Abis qtAbis = qtVersion->qtAbis();
if (qtAbis.empty())
continue;
qtVersionsForArch[qtAbis.first()].append(qtVersion);

4
src/plugins/android/androidqtversion.cpp
View File

@@ -69,9 +69,9 @@ QString AndroidQtVersion::invalidReason() const
return tmp;
}
QList<Abi> AndroidQtVersion::detectQtAbis() const
Abis AndroidQtVersion::detectQtAbis() const
{
QList<Abi> abis = BaseQtVersion::detectQtAbis();
Abis abis = BaseQtVersion::detectQtAbis();
for (int i = 0; i < abis.count(); ++i) {
abis[i] = Abi(abis.at(i).architecture(),
abis.at(i).os(),

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

@@ -43,7 +43,7 @@ public:
bool isValid() const override;
QString invalidReason() const override;
QList<ProjectExplorer::Abi> detectQtAbis() const override;
ProjectExplorer::Abis detectQtAbis() const override;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
Utils::Environment qmakeRunEnvironment() const override;