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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b
This commit is contained in:
Oswald Buddenhagen
2016-04-01 17:31:39 +02:00
parent 26e51ff633 ea1f5d2b6c
commit e426d08e54
143 changed files with 6586 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidtoolchain.cpp
View File

@@ -234,7 +234,7 @@ void AndroidToolChain::setSecondaryToolChain(bool b)
m_secondaryToolChain = b;
}
QList<Abi> AndroidToolChain::detectSupportedAbis() const
GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const
{
return QList<Abi>() << targetAbi();
}

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

@@ -59,7 +59,7 @@ public:
void setSecondaryToolChain(bool b);
protected:
QList<ProjectExplorer::Abi> detectSupportedAbis() const override;
DetectedAbisResult detectSupportedAbis() const override;
private:
explicit AndroidToolChain(const ProjectExplorer::Abi &abi, const QString &ndkToolChainVersion, Detection d);