summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTakayuki ORITO <iori.ayane@gmail.com>2018-03-11 22:24:21 +0900
committerKatja Marttila <katja.marttila@qt.io>2018-03-13 11:03:07 +0000
commit35af20a8ed477f53e3a82b3d32d9cf44e5b0dc34 (patch)
tree3f75853aeb4cbed15d3f0c994e0306069dedff82 /tools
parent955253bde9eeaa57c30e398402410a2b8f7667a9 (diff)
Fix devtool's segmentation fault when using operation
change the name of the variable to parse the arguments of operation command. Change-Id: I251b17e6e48b0a5c12636199de57bbb761b3ac23 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/devtool/main.cpp12
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) {