forked from qt-creator/qt-creator
		
	Android Kits: Use ANDROID_TARGET_ARCH in display name
Note this only affects newly generated kits. Task-number: QTCREATORBUG-9865 Change-Id: I9f62c1d1932aa32e1a307b92ce0f8ba80bb6ed5c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
		@@ -46,6 +46,8 @@
 | 
			
		||||
#include <projectexplorer/kit.h>
 | 
			
		||||
#include <projectexplorer/projectexplorer.h>
 | 
			
		||||
 | 
			
		||||
#include <proparser/profileevaluator.h>
 | 
			
		||||
 | 
			
		||||
using namespace Android::Internal;
 | 
			
		||||
using namespace ProjectExplorer;
 | 
			
		||||
using namespace Qt4ProjectManager;
 | 
			
		||||
@@ -130,6 +132,17 @@ QString AndroidQtVersion::description() const
 | 
			
		||||
    return tr("Android");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QString AndroidQtVersion::targetArch() const
 | 
			
		||||
{
 | 
			
		||||
    ensureMkSpecParsed();
 | 
			
		||||
    return m_targetArch;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void AndroidQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
 | 
			
		||||
{
 | 
			
		||||
    m_targetArch = evaluator->value(QLatin1String("ANDROID_TARGET_ARCH"));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Core::FeatureSet AndroidQtVersion::availableFeatures() const
 | 
			
		||||
{
 | 
			
		||||
    Core::FeatureSet features = QtSupport::BaseQtVersion::availableFeatures();
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user