diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
| commit | 5d4cbf4094c9b290626aab89e4bd92edd29ce49f (patch) | |
| tree | eac893652c724f057fba493688b16e212fd844dd /tools/qml | |
| 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/qml')
| -rw-r--r-- | tools/qml/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index fdfc66f3a6..e185fc41a9 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -453,6 +453,7 @@ int main(int argc, char *argv[]) app->setApplicationName("Qml Runtime"); app->setOrganizationName("QtProject"); app->setOrganizationDomain("qt-project.org"); + QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR)); qmlRegisterType<Config>("QmlRuntime.Config", 1, 0, "Configuration"); qmlRegisterType<PartialScene>("QmlRuntime.Config", 1, 0, "PartialScene"); |