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

Android: Initialize members

Browse Source 
Change-Id: Iba2ec7c99d4083edf92601a8a7f2e5074f30cd7b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Robert Loehning
2017-12-12 13:48:53 +01:00
parent a44d7b9ced
commit 517b35c9d7
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -86,7 +86,6 @@ AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
: ProjectExplorer::BuildStep(parent, Id) : ProjectExplorer::BuildStep(parent, Id)
{ {
m_uninstallPreviousPackage = QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); m_uninstallPreviousPackage = QtSupport::QtKitInformation::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);
m_uninstallPreviousPackageRun = false;
//: AndroidDeployQtStep default display name //: AndroidDeployQtStep default display name
setDefaultDisplayName(tr("Deploy to Android device")); setDefaultDisplayName(tr("Deploy to Android device"));

10
src/plugins/android/androiddeployqtstep.h
View File

@@ -120,17 +120,17 @@ private:
QString m_libdir; QString m_libdir;
QString m_targetArch; QString m_targetArch;
bool m_uninstallPreviousPackage; bool m_uninstallPreviousPackage = false;
bool m_uninstallPreviousPackageRun; bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt; bool m_useAndroiddeployqt = false;
bool m_askForUinstall; bool m_askForUinstall = false;
static const Core::Id Id; static const Core::Id Id;
QString m_androiddeployqtArgs; QString m_androiddeployqtArgs;
QString m_adbPath; QString m_adbPath;
QString m_command; QString m_command;
QString m_workingDirectory; QString m_workingDirectory;
Utils::Environment m_environment; Utils::Environment m_environment;
Utils::QtcProcess *m_process; Utils::QtcProcess *m_process = nullptr;
AndroidDeviceInfo m_deviceInfo; AndroidDeviceInfo m_deviceInfo;
}; };