diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-18 10:29:10 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-18 10:29:47 +0200 |
| commit | eb30e3d7ee81c48cea720e7ecd2ed45647bc70ee (patch) | |
| tree | 810e8ad0642434eeb4043c3a06c82217314300e1 /tests/auto/qml/qml.pro | |
| parent | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (diff) | |
| parent | 521ace713d8e5230d47f3da8cd941699ca085af2 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/qml/debugger/qv4debugservice.cpp
src/qml/jsruntime/qv4value_inl_p.h
src/qml/jsruntime/qv4value_p.h
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mm_p.h
src/qml/qml/qqmlnotifier_p.h
src/qml/qml/qqmlproperty.cpp
src/quick/items/qquickflickable.cpp
src/quick/items/qquicktextedit.cpp
tests/auto/quick/qquickwindow/BLACKLIST
The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.
Change-Id: I16d1920abf448c29a01822256f52153651a56356
Diffstat (limited to 'tests/auto/qml/qml.pro')
| -rw-r--r-- | tests/auto/qml/qml.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 2ca3e42991..b61eca730f 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -25,7 +25,8 @@ PUBLICTESTS += \ qtqmlmodules \ qquickfolderlistmodel \ qqmlapplicationengine \ - qqmlsettings + qqmlsettings \ + qqmlstatemachine PRIVATETESTS += \ animation \ |