diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-01 01:00:10 +0200 |
| commit | bbc52bcbb6391c4925df26672eb1f26040c6f67c (patch) | |
| tree | 14b8580e21aecc5b08a35f69ac55e7fbc3aef3ba /tools | |
| parent | 5ff4facd8efc41b30b5ffa5abb6a12406685ca0b (diff) | |
| parent | cc0829cbf300e56360e3d61efe4dfd20efcabb1c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6e9b5fbf50da24cae9e555723a5f1d8365d4a2f3
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 5c5a6a8eb1..56bb633b9b 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -79,9 +79,9 @@ namespace { const uint qtQmlMajorVersion = 2; -const uint qtQmlMinorVersion = 2; +const uint qtQmlMinorVersion = QT_VERSION_MINOR; const uint qtQuickMajorVersion = 2; -const uint qtQuickMinorVersion = 8; +const uint qtQuickMinorVersion = QT_VERSION_MINOR; const QString qtQuickQualifiedName = QString::fromLatin1("QtQuick %1.%2") .arg(qtQuickMajorVersion) |