diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2016-12-05 14:02:27 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-12-07 08:39:36 +0000 |
commit | ab20b08d6df2467c64b4ea3de4cbde22a26aa896 (patch) | |
tree | af71a232f1c34cff272a7b068b1fdd2314a8f6b9 /src/plugins/android | |
parent | 521423b43313459f5e9c75d0720945cc37f6ef8c (diff) | |
download | qt-creator-ab20b08d6df2467c64b4ea3de4cbde22a26aa896.tar.gz |
Android: Initialize all members
Change-Id: Id10174da9c8b6e2cf34ac3465f0bf57361990e7e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r-- | src/plugins/android/androidbuildapkstep.cpp | 6 | ||||
-rw-r--r-- | src/plugins/android/androidbuildapkstep.h | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index f72f707bf3..6293390086 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -60,11 +60,6 @@ const QLatin1String UseGradleKey("UseGradle"); AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, const Core::Id 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())) { const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); @@ -82,6 +77,7 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, m_verbose(other->m_verbose), m_useGradle(other->m_useGradle), m_openPackageLocation(other->m_openPackageLocation), + // leave m_openPackageLocationForRun at false m_buildTargetSdk(other->m_buildTargetSdk) { const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index c8984b4890..84fdd09534 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -98,12 +98,12 @@ protected: void processFinished(int exitCode, QProcess::ExitStatus status) override; protected: - AndroidDeployAction m_deployAction; - bool m_signPackage; - bool m_verbose; - bool m_useGradle; - bool m_openPackageLocation; - bool m_openPackageLocationForRun; + AndroidDeployAction m_deployAction = BundleLibrariesDeployment; + bool m_signPackage = false; + bool m_verbose = false; + bool m_useGradle = false; + bool m_openPackageLocation = false; + bool m_openPackageLocationForRun = false; QString m_buildTargetSdk; Utils::FileName m_keystorePath; |