diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /src/imports/testlib | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'src/imports/testlib')
| -rw-r--r-- | src/imports/testlib/quicktestevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/testlib/quicktestevent.cpp b/src/imports/testlib/quicktestevent.cpp index 56faff9f7e..f2d7f93d26 100644 --- a/src/imports/testlib/quicktestevent.cpp +++ b/src/imports/testlib/quicktestevent.cpp @@ -125,7 +125,7 @@ bool QuickTestEvent::keyClickChar(const QString &character, int modifiers, int d // valueToKeySequence() is copied from qquickshortcut.cpp static QKeySequence valueToKeySequence(const QVariant &value) { - if (value.type() == QVariant::Int) + if (value.userType() == QMetaType::Int) return QKeySequence(static_cast<QKeySequence::StandardKey>(value.toInt())); return QKeySequence::fromString(value.toString()); } |