diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 12:49:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 12:59:04 +0100 |
| commit | 4e7f570f921671c627040537b4dd8cdb77bda3d1 (patch) | |
| tree | 7d82e1b6536d5274ab29a3e6307fedcbefd3ce78 /tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml | |
| parent | 72447b6dbf98ace65ec46559337243970a668d26 (diff) | |
| parent | 39df6760e4db6af700c46a420286b51113b5dadb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickitem.cpp
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42
Diffstat (limited to 'tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml')
| -rw-r--r-- | tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml new file mode 100644 index 0000000000..d8b7833467 --- /dev/null +++ b/tests/auto/quick/qquickitem2/data/qtbug_50516_2_1.qml @@ -0,0 +1,13 @@ +import QtQuick 2.1 +import Test 1.0 + +TabFence2 { + objectName: "root" + focus: true + width: 800 + height: 600 + Item { + objectName: "item" + focus: true + } +} |