diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-11-21 12:29:40 +0100 |
| commit | d373d5e7d70e968cfba8957596ed6fe4f46990c8 (patch) | |
| tree | c52bf2b0fbbfdb13d644b4050aa7a931ef4b7109 /src/qmltest | |
| parent | 9880acb424fd814501ba5fc4ae1caa989e23fafa (diff) | |
| parent | 9af8a47746b69b6040fc149c1d24602a1e25b08f (diff) | |
Merge remote-tracking branch 'origin/wip/new-backend' into dev
Conflicts:
src/qml/compiler/qv4isel_moth.cpp
src/qml/compiler/qv4jsir_p.h
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4vme_moth.cpp
tests/auto/qml/qml.pro
Change-Id: Ia7b6ec24c7fcbcbb1786d9e798d2df294020ae37
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 90d11e9734..8a2282f5c6 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -57,6 +57,7 @@ #include <QtCore/qmap.h> #include <QtCore/qbytearray.h> #include <QtCore/qcoreapplication.h> +#include <QtCore/qdatetime.h> #include <QtCore/qdebug.h> #include <QtCore/QUrl> #include <QtCore/QDir> |