diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-12 10:59:12 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-01-19 16:08:57 +0000 |
| commit | c05a3fdb3de59a3b9bd91dafee20453d5a138cfc (patch) | |
| tree | 7d0e56d73efc477b5cfa195781f7971c4410219e /src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | |
| parent | 0e874ba59935cfaba1c4c0e12a423064814ddaa4 (diff) | |
Give the values of BuildStep::OutputFormat better names
The old ones did not convey their meaning very well. In particular,
NormalOutput and MessageOutput were easily confused.
Change-Id: Ia0a8c1b1c366ab3f5c59f751b37b8b1f68f6831d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp')
| -rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index fb0350ef98..ea90d04037 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -119,7 +119,7 @@ Utils::FileName QmakeAndroidBuildApkStep::androidPackageSourceDir() const bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) { if (AndroidManager::checkForQt51Files(project()->projectDirectory())) - emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput); + emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), OutputFormat::Stderr); if (!AndroidBuildApkStep::init(earlierSteps)) return false; @@ -221,7 +221,7 @@ bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) void QmakeAndroidBuildApkStep::run(QFutureInterface<bool> &fi) { if (m_skipBuilding) { - emit addOutput(tr("No application .pro file found, not building an APK."), BuildStep::ErrorMessageOutput); + emit addOutput(tr("No application .pro file found, not building an APK."), BuildStep::OutputFormat::ErrorMessage); reportRunResult(fi, true); return; } @@ -247,7 +247,7 @@ void QmakeAndroidBuildApkStep::processStarted() emit addOutput(tr("Starting: \"%1\" %2") .arg(QDir::toNativeSeparators(m_command), m_argumentsPasswordConcealed), - BuildStep::MessageOutput); + BuildStep::OutputFormat::NormalMessage); } ProjectExplorer::BuildStepConfigWidget *QmakeAndroidBuildApkStep::createConfigWidget() |