diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:24:03 +0200 |
| commit | cb5cbe9eb7c9a68acbe19ff2fd0c299e30f42eca (patch) | |
| tree | 2ba783322c213c9c533163dc69c950367f767a44 /tools/qmlplugindump | |
| parent | 8de7ec4bf82c35ff1413fb5f5a5ca1788dc93af3 (diff) | |
| parent | 16914894f035963ace51c92de13aad11a53c3cf8 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/compiler/qv4isel_moth_p.h
Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69
Diffstat (limited to 'tools/qmlplugindump')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index de8d238578..3294fa1e87 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -76,7 +76,7 @@ static const uint qtQmlMajorVersion = 2; static const uint qtQmlMinorVersion = 2; static const uint qtQuickMajorVersion = 2; -static const uint qtQuickMinorVersion = 7; +static const uint qtQuickMinorVersion = 8; const QString qtQuickQualifiedName = QString::fromLatin1("QtQuick %1.%2") .arg(qtQuickMajorVersion) |