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

Android: Modernize

Browse Source 
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-equals-default
modernize-use-transparent-functors

Change-Id: I6c9e567edf16cf436c0e0c1239b40f74574a1096
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-25 12:19:15 +02:00
committed by Vikas Pachdha
parent 02a759d4f5
commit be5c228e5b
42 changed files with 153 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -48,8 +48,8 @@ bool AndroidQtVersionFactory::canRestore(const QString &type)
QtSupport::BaseQtVersion *AndroidQtVersionFactory::restore(const QString &type,
const QVariantMap &data)
{
QTC_ASSERT(canRestore(type), return 0);
AndroidQtVersion *v = new AndroidQtVersion;
QTC_ASSERT(canRestore(type), return nullptr);
auto v = new AndroidQtVersion;
v->fromMap(data);
return v;
}
@@ -63,12 +63,12 @@ QtSupport::BaseQtVersion *AndroidQtVersionFactory::create(const Utils::FileName
{
QFileInfo fi = qmakePath.toFileInfo();
if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
return 0;
return nullptr;
if (!evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android"))
&& evaluator->value(QLatin1String("QMAKE_PLATFORM")) != QLatin1String("android"))
return 0;
return nullptr;
if (evaluator->values(QLatin1String("CONFIG")).contains(QLatin1String("android-no-sdk")))
return 0;
return nullptr;
return new AndroidQtVersion(qmakePath, isAutoDetected, autoDetectionSource);
}