diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 10:14:57 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 11:48:14 +0100 |
| commit | b1fa22c1683d9f6cedb001f5ef8a0dac71868935 (patch) | |
| tree | c30a114c75be071310df974283b928329f9d5c12 /tests/auto/quick/qquickflickable/data | |
| parent | ba68c325688acf3072715757480497524f61c425 (diff) | |
| parent | fe5d69669197a51662061b014810f0242eec5ca7 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/quick/accessible/qaccessiblequickview_p.h
src/quick/items/qquickmousearea.cpp
src/quick/util/qquickanimatorjob.cpp
tools/qmlplugindump/main.cpp
Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809
Diffstat (limited to 'tests/auto/quick/qquickflickable/data')
| -rw-r--r-- | tests/auto/quick/qquickflickable/data/hide.qml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickflickable/data/hide.qml b/tests/auto/quick/qquickflickable/data/hide.qml new file mode 100644 index 0000000000..ab520549e2 --- /dev/null +++ b/tests/auto/quick/qquickflickable/data/hide.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 + +Flickable { + id: flickable + width: 200; height: 200 + contentWidth: 400; contentHeight: 400 + + MouseArea { + objectName: "mouseArea" + width: 400; height: 400 + onDoubleClicked: flickable.visible = false + } +} |