Consolidate test helpers into private libraries

Previously each test would include and build sources from the shared
folder. Now we make those sources a library, build it once, then have
each test link to it instead.

We also take the opportunity to move some helpers that qtquickcontrols2
had added into the quicktestutils library where it makes sense, and
for the helpers that don't make sense to be there, move them into
quickcontrolstestutils.

We add the libraries to src/ so that they are internal modules built as
part of Qt, rather than tests. That way we can use them in a standalone
test outside of qtdeclarative.

Task-number: QTBUG-95621
Pick-to: 6.2
Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 9 insertions, 1 deletions

diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index 84e08c471a..dc0365c5cf 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -34,13 +34,16 @@
 #include <QtQmlModels/private/qqmlinstantiator_p.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlincubator.h>
-#include "../../shared/util.h"
+#include <QtQuickTestUtils/private/qmlutils_p.h>
 #include "stringmodel.h"
 
 class tst_qqmlinstantiator: public QQmlDataTest
 {
     Q_OBJECT
 
+public:
+    tst_qqmlinstantiator();
+
 private slots:
     void createNone();
     void createSingle();
@@ -54,6 +57,11 @@ private slots:
     void asynchronous();
 };
 
+tst_qqmlinstantiator::tst_qqmlinstantiator()
+    : QQmlDataTest(QT_QMLTEST_DATADIR)
+{
+}
+
 void tst_qqmlinstantiator::createNone()
 {
     QQmlEngine engine;