diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-29 15:23:44 +0200 |
| commit | 89f8e1f54ff1f7e033f9a9da232bcb4c72b1e45f (patch) | |
| tree | 570a9c7aa1d53b7d38ecb74b856203e19df59c52 /tests/auto/applicationwindow | |
| parent | 48d24fe2e4d6ce6d91805a3425be0954126acc84 (diff) | |
| parent | d091c75c0b953a8b91c57f075769036bd09ae4c2 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickmenu.cpp
Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
Diffstat (limited to 'tests/auto/applicationwindow')
| -rw-r--r-- | tests/auto/applicationwindow/data/attachedProperties.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/applicationwindow/data/attachedProperties.qml b/tests/auto/applicationwindow/data/attachedProperties.qml index 604a12bf..09bc47ef 100644 --- a/tests/auto/applicationwindow/data/attachedProperties.qml +++ b/tests/auto/applicationwindow/data/attachedProperties.qml @@ -68,7 +68,7 @@ ApplicationWindow { property Item attached_overlay: ApplicationWindow.overlay } - Control { + Item { id: childItem property ApplicationWindow attached_window: ApplicationWindow.window @@ -116,7 +116,7 @@ ApplicationWindow { property Item attached_overlay: ApplicationWindow.overlay } - Control { + Item { id: childWindowItem property ApplicationWindow attached_window: ApplicationWindow.window @@ -165,7 +165,7 @@ ApplicationWindow { property Item attached_overlay: ApplicationWindow.overlay } - Control { + Item { id: childAppWindowItem property ApplicationWindow attached_window: ApplicationWindow.window |