diff options
author | Katja Marttila <katja.marttila@qt.io> | 2018-03-20 11:16:34 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2018-03-20 11:20:38 +0200 |
commit | 3f281b049c814602130dd433cedae84e44b28838 (patch) | |
tree | c127c9320077bc34742d2762241f94ab896c23f7 /tools | |
parent | 486d4c68f3f0ea8294fbdb702f1cba1826367216 (diff) | |
parent | 6f28abfa588d36076ad24f39a17d6752fd070ab6 (diff) |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I601b783a9d2eed009737b2779803457949cbb014
Diffstat (limited to 'tools')
-rw-r--r-- | tools/devtool/main.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp index 7418efda6..e0b31695c 100644 --- a/tools/devtool/main.cpp +++ b/tools/devtool/main.cpp @@ -237,13 +237,13 @@ int main(int argc, char *argv[]) .collections()); // setup the binary format engine OperationRunner runner(magicMarker, operations); - const QStringList arguments = arguments.last().split(QLatin1Char(',')); - if (arguments.first() == QLatin1String("DO")) - result = runner.runOperation(arguments.mid(1), OperationRunner::RunMode::Do); - else if (arguments.first() == QLatin1String("UNDO")) - result = runner.runOperation(arguments.mid(1), OperationRunner::RunMode::Undo); + const QStringList operationArguments = arguments.last().split(QLatin1Char(',')); + if (operationArguments.first() == QLatin1String("DO")) + result = runner.runOperation(operationArguments.mid(1), OperationRunner::RunMode::Do); + else if (operationArguments.first() == QLatin1String("UNDO")) + result = runner.runOperation(operationArguments.mid(1), OperationRunner::RunMode::Undo); else - std::cerr << "Malformed argument: " << qPrintable(arguments.last()) << std::endl; + std::cerr << "Malformed argument: " << qPrintable(operationArguments.last()) << std::endl; } } catch (const QInstaller::Error &error) { |