diff options
| author | Liang Qi <[email protected]> | 2016-11-23 10:49:37 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-11-23 10:49:37 +0100 |
| commit | 5d4cbf4094c9b290626aab89e4bd92edd29ce49f (patch) | |
| tree | eac893652c724f057fba493688b16e212fd844dd /tools/qmljs/qmljs.cpp | |
| parent | 13cf5f02ce788f19a73e5d5c3da76e57291761a5 (diff) | |
| parent | 07cde200e55ee03bf9e2f9af89c20f91072deccc (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4object_p.h
Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9
Diffstat (limited to 'tools/qmljs/qmljs.cpp')
| -rw-r--r-- | tools/qmljs/qmljs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp index d09d2f7d0c..850b9a9a0a 100644 --- a/tools/qmljs/qmljs.cpp +++ b/tools/qmljs/qmljs.cpp @@ -135,6 +135,7 @@ static void showException(QV4::ExecutionContext *ctx, const QV4::Value &exceptio int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); + QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR)); QStringList args = app.arguments(); args.removeFirst(); |