3 files changed, 15 insertions, 2 deletions
diff --git a/tests/manual/quickcontrols/gifs/CMakeLists.txt b/tests/manual/quickcontrols/gifs/CMakeLists.txt
index 148aefe80f..674806e145 100644
--- a/tests/manual/quickcontrols/gifs/CMakeLists.txt
+++ b/tests/manual/quickcontrols/gifs/CMakeLists.txt
@@ -13,13 +13,12 @@ endif()
 ## tst_gifs Test:
 #####################################################################
 
-# Collect test data
 file(GLOB_RECURSE test_data_glob
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/data/*)
 list(APPEND test_data ${test_data_glob})
 
-qt_internal_add_manual_test(tst_gifs
+qt_internal_add_test(tst_gifs
     SOURCES
         capturedevent.cpp capturedevent.h
         eventcapturer.cpp eventcapturer.h
@@ -28,9 +27,21 @@ qt_internal_add_manual_test(tst_gifs
     LIBRARIES
         Qt::Gui
         Qt::Quick
+        Qt::Test
     TESTDATA ${test_data}
 )
 
+# Make the QML files available to Creator's locator.
+target_sources(tst_gifs
+    PRIVATE
+        ${test_data}
+)
+
+set_source_files_properties(${test_data}
+    PROPERTIES
+        HEADER_FILE_ONLY ON
+)
+
 #### Keys ignored in scope 1:.:.:gifs.pro:<TRUE>:
 # TEMPLATE = "app"
 
diff --git a/tests/manual/quickcontrols/headerview/main.cpp b/tests/manual/quickcontrols/headerview/main.cpp
index fb4e191a88..9278683836 100644
--- a/tests/manual/quickcontrols/headerview/main.cpp
+++ b/tests/manual/quickcontrols/headerview/main.cpp
@@ -5,6 +5,7 @@
 #include <QDebug>
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
+#include <QSet>
 
 class TestTableModel : public QAbstractTableModel {
     Q_OBJECT
diff --git a/tests/manual/quickcontrols/testbench/clipboard.cpp b/tests/manual/quickcontrols/testbench/clipboard.cpp
index e8017e0e23..745b4ae04e 100644
--- a/tests/manual/quickcontrols/testbench/clipboard.cpp
+++ b/tests/manual/quickcontrols/testbench/clipboard.cpp
@@ -6,6 +6,7 @@
 #include <QClipboard>
 #include <QGuiApplication>
 #include <QSettings>
+#include <QMap>
 
 const QStringList keys = {
     "Palette/window",