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

Android: Initialize all members

Browse Source 
Change-Id: Id10174da9c8b6e2cf34ac3465f0bf57361990e7e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-05 14:02:27 +01:00
parent 521423b433
commit ab20b08d6d
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -60,11 +60,6 @@ const QLatin1String UseGradleKey("UseGradle");
AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, const Core::Id id) AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, const Core::Id id)
: ProjectExplorer::AbstractProcessStep(parent, id), : ProjectExplorer::AbstractProcessStep(parent, id),
m_deployAction(BundleLibrariesDeployment),
m_signPackage(false),
m_verbose(false),
m_useGradle(false),
m_openPackageLocation(false),
m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk())) m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::currentConfig().highestAndroidSdk()))
{ {
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());
@@ -82,6 +77,7 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent,
m_verbose(other->m_verbose), m_verbose(other->m_verbose),
m_useGradle(other->m_useGradle), m_useGradle(other->m_useGradle),
m_openPackageLocation(other->m_openPackageLocation), m_openPackageLocation(other->m_openPackageLocation),
// leave m_openPackageLocationForRun at false
m_buildTargetSdk(other->m_buildTargetSdk) m_buildTargetSdk(other->m_buildTargetSdk)
{ {
const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit());

12
src/plugins/android/androidbuildapkstep.h
View File

@@ -98,12 +98,12 @@ protected:
void processFinished(int exitCode, QProcess::ExitStatus status) override; void processFinished(int exitCode, QProcess::ExitStatus status) override;
protected: protected:
AndroidDeployAction m_deployAction; AndroidDeployAction m_deployAction = BundleLibrariesDeployment;
bool m_signPackage; bool m_signPackage = false;
bool m_verbose; bool m_verbose = false;
bool m_useGradle; bool m_useGradle = false;
bool m_openPackageLocation; bool m_openPackageLocation = false;
bool m_openPackageLocationForRun; bool m_openPackageLocationForRun = false;
QString m_buildTargetSdk; QString m_buildTargetSdk;
Utils::FileName m_keystorePath; Utils::FileName m_keystorePath;