diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
| commit | 759cdce3e6d22995106cfec0f1e6c6cbd3fdf266 (patch) | |
| tree | 0786bd9d91492a784859578b136de9abc1dbba45 /tools | |
| parent | ee6ab05bba3622adcaf1787947b239659b8ac241 (diff) | |
| parent | 15416b1ffc6ce83a11bfe5d05e97ecdc45d3411c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7b98beb61f73a74b80cf80a49b63819aa6eb528e
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 7c04f69a2b..1751ba2ecf 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -545,7 +545,7 @@ int main(int argc, char **argv) } else if (inputFile.endsWith(QLatin1String(".js"))) { Error error; if (!compileJSFile(inputFile, inputFileUrl, saveFunction, &error)) { - error.augment(QLatin1String("Error compiling qml file: ")).print(); + error.augment(QLatin1String("Error compiling js file: ")).print(); return EXIT_FAILURE; } } else { |