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 /tests/auto/qml/qml.pro | |
| 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 'tests/auto/qml/qml.pro')
| -rw-r--r-- | tests/auto/qml/qml.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 05528eea30..8471d6466f 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -35,7 +35,6 @@ PUBLICTESTS += \ PRIVATETESTS += \ qqmlcpputils \ qqmldirparser \ - v4misc \ qmlcachegen PRIVATETESTS += \ @@ -77,7 +76,7 @@ qtHaveModule(widgets) { PUBLICTESTS += \ qjsengine \ qjsvalue \ - qwidgetsinqml +# qwidgetsinqml } SUBDIRS += $$PUBLICTESTS |