9 files changed, 15 insertions, 8 deletions
diff --git a/tests/manual/quickcontrols/screenshots/CMakeLists.txt b/tests/manual/quickcontrols/screenshots/CMakeLists.txt
index 27a8ac882c..32d465b9d4 100644
--- a/tests/manual/quickcontrols/screenshots/CMakeLists.txt
+++ b/tests/manual/quickcontrols/screenshots/CMakeLists.txt
@@ -18,7 +18,7 @@ qt_internal_add_manual_test(screenshots
     SOURCES
         screenshots.cpp
     DEFINES
-        SNIPPETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports/controls/doc/snippets"
+        SNIPPETS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/quickcontrols/doc/snippets"
     LIBRARIES
         Qt::Gui
         Qt::Quick
diff --git a/tests/manual/quickcontrols/screenshots/screenshots.qml b/tests/manual/quickcontrols/screenshots/screenshots.qml
index cd8d52d658..e3bcfa860d 100644
--- a/tests/manual/quickcontrols/screenshots/screenshots.qml
+++ b/tests/manual/quickcontrols/screenshots/screenshots.qml
@@ -47,7 +47,7 @@ ApplicationWindow {
                 showDirs: false
             }
             delegate: ItemDelegate {
-                width: parent.width
+                width: snippetsListView.width
                 text: fileName
                 focusPolicy: Qt.NoFocus
 
diff --git a/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml b/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml
index d64339501f..e8e1194a01 100644
--- a/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/CheckDelegate.qml
@@ -32,7 +32,7 @@ QtObject {
         clip: true
         model: 20
         delegate: CheckDelegate {
-            width: parent.width
+            width: ListView.view.width
             text: "CheckDelegate"
             focusPolicy: Qt.StrongFocus
         }
diff --git a/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml b/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml
index e8171c36bc..d6ed7c54d2 100644
--- a/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/ItemDelegate.qml
@@ -29,7 +29,7 @@ QtObject {
         clip: true
         model: 20
         delegate: ItemDelegate {
-            width: parent.width
+            width: ListView.view.width
             text: "ItemDelegate"
             focusPolicy: Qt.StrongFocus
         }
diff --git a/tests/manual/quickcontrols/testbench/controls/Menu.qml b/tests/manual/quickcontrols/testbench/controls/Menu.qml
index aeadee4f86..a420163042 100644
--- a/tests/manual/quickcontrols/testbench/controls/Menu.qml
+++ b/tests/manual/quickcontrols/testbench/controls/Menu.qml
@@ -42,15 +42,18 @@ QtObject {
 
             MenuItem {
                 text: "Checked"
+                checkable: true
                 checked: true
             }
             MenuItem {
                 text: "Checked + Pressed"
+                checkable: true
                 checked: true
                 down: true
             }
             MenuItem {
                 text: "Checked + Disabled"
+                checkable: true
                 checked: true
                 enabled: false
             }
diff --git a/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml b/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml
index 4dab387fcf..364770c187 100644
--- a/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/RadioDelegate.qml
@@ -31,7 +31,7 @@ QtObject {
         clip: true
         model: 20
         delegate: RadioDelegate {
-            width: parent.width
+            width: ListView.view.width
             text: "RadioDelegate"
             focusPolicy: Qt.StrongFocus
         }
diff --git a/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml b/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml
index e04f0bb630..1c4c22c608 100644
--- a/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SwipeDelegate.qml
@@ -48,7 +48,7 @@ QtObject {
         clip: true
         model: 20
         delegate: SwipeDelegate {
-            width: parent.width
+            width: ListView.view.width
             text: "SwipeDelegate"
             focusPolicy: Qt.StrongFocus
 
diff --git a/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml b/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml
index 9508b2ce80..2f6b26c47a 100644
--- a/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml
+++ b/tests/manual/quickcontrols/testbench/controls/SwitchDelegate.qml
@@ -31,7 +31,7 @@ QtObject {
         clip: true
         model: 20
         delegate: SwitchDelegate {
-            width: parent.width
+            width: ListView.view.width
             text: "SwitchDelegate"
             focusPolicy: Qt.StrongFocus
         }
diff --git a/tests/manual/quickcontrols/testbench/testbench.qml b/tests/manual/quickcontrols/testbench/testbench.qml
index 9df1ed873f..1a95de71be 100644
--- a/tests/manual/quickcontrols/testbench/testbench.qml
+++ b/tests/manual/quickcontrols/testbench/testbench.qml
@@ -139,7 +139,11 @@ Ui.ApplicationWindow {
                 text: "\ue801"
                 font.family: "fontello"
                 visible: searchTextField.length > 0
-                onClicked: searchTextField.clear()
+                onClicked: {
+                    searchTextField.clear()
+                    // textEdited is not emitted for clear(), so we have to set this ourselves.
+                    settings.lastSearchText = ""
+                }
 
                 Layout.leftMargin: -5
             }