Commit 64c31f18 authored by Tobias Hunger's avatar Tobias Hunger

Android: Simplify qmakeandroidbuildapkstep

Change-Id: Ib4d0caaa92be850e03c919988079bb9cab6fa06f
Reviewed-by: Vikas Pachdha's avatarVikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger's avatarTobias Hunger <tobias.hunger@qt.io>
parent 27dbbbc2
......@@ -90,9 +90,7 @@ ProjectExplorer::BuildStep *QmakeAndroidBuildApkStepFactory::clone(ProjectExplor
QmakeAndroidBuildApkStep::QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc)
:AndroidBuildApkStep(bc, ANDROID_BUILD_APK_ID)
{
ctor();
}
{ }
Utils::FileName QmakeAndroidBuildApkStep::proFilePathForInputFile() const
{
......@@ -104,9 +102,7 @@ Utils::FileName QmakeAndroidBuildApkStep::proFilePathForInputFile() const
QmakeAndroidBuildApkStep::QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, QmakeAndroidBuildApkStep *other)
: AndroidBuildApkStep(bc, other)
{
ctor();
}
{ }
Utils::FileName QmakeAndroidBuildApkStep::androidPackageSourceDir() const
{
......@@ -120,10 +116,6 @@ Utils::FileName QmakeAndroidBuildApkStep::androidPackageSourceDir() const
return Utils::FileName::fromString(sourceDirInfo.canonicalFilePath());
}
void QmakeAndroidBuildApkStep::ctor()
{
}
bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps)
{
if (AndroidManager::checkForQt51Files(project()->projectDirectory()))
......
......@@ -61,7 +61,6 @@ protected:
Utils::FileName androidPackageSourceDir() const override;
protected:
void ctor();
bool init(QList<const BuildStep *> &earlierSteps) override;
void run(QFutureInterface<bool> &fi) override;
void processStarted() override;
......@@ -75,7 +74,7 @@ private:
const QStringList &arguments, const QString &command);
QString m_command;
QString m_argumentsPasswordConcealed;
bool m_skipBuilding;
bool m_skipBuilding = false;
};
} // namespace Internal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment