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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771
This commit is contained in:
Eike Ziller
2020-11-10 13:42:46 +01:00
parent 2ecfda056b 0eb65f7211
commit 1d2b5db02f
466 changed files with 7273 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -630,8 +630,7 @@ void QMakeStep::abisChanged()
args << prefix + '"' + m_selectedAbis.join(' ') + '"';
setExtraArguments(args);
const QString buildKey = target()->activeBuildKey();
buildSystem()->setExtraData(buildKey, Android::Constants::ANDROID_ABIS, m_selectedAbis);
buildSystem()->setProperty(Android::Constants::ANDROID_ABIS, m_selectedAbis);
}
updateAbiWidgets();