diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:20:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-05-10 15:21:47 +0200 |
| commit | afcbdccbe7be5446f693a84cdf1886fe92a2e033 (patch) | |
| tree | 550d9ce3f11d95ee5a355f32a232c083cfe0304c /tests/auto/qml/qqmlengine/tst_qqmlengine.cpp | |
| parent | 23a3018fc6a1e650b7eb291009c20d46c9e5c9af (diff) | |
| parent | 7434d05cc102f27d36b8efccb4e37f20a4886ea9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Contains the fix for tst_TouchMouse::hoverEnabled which has caused
numerous failures in the last few days.
Change-Id: I1e523087a53d1df0334d602e4125f5cddc9bf470
Diffstat (limited to 'tests/auto/qml/qqmlengine/tst_qqmlengine.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlengine/tst_qqmlengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp index 3f6107ab2b..07569efc72 100644 --- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp +++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp @@ -36,6 +36,7 @@ #include <QSignalSpy> #include <QDebug> #include <QBuffer> +#include <QCryptographicHash> #include <QQmlComponent> #include <QQmlNetworkAccessManagerFactory> #include <QQmlExpression> |