Fix qmltest duplication mess

We had split qmltest directory since we could not run qml tests
without test support, however this duplicated quite a lot files.
Moreover adding more fine-grained checks would  mean creating
even more copies.

Generate test list on qmake call, so we can fine-grained which test
should be run.

Change-Id: I093bdd6deeca50a1936a72276d7d6af12a376c45
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 209b1fefd..8423df1bd 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -28,6 +28,10 @@
 
 #include <httpserver.h>
 
+#if QT_CONFIG(ssl)
+#include <httpsserver.h>
+#endif
+
 #include <QtCore/QScopedPointer>
 #include <QTemporaryDir>
 #include <QtQuickTest/quicktest.h>
@@ -151,6 +155,12 @@ int main(int argc, char **argv)
         return server;
     });
 
+#if QT_CONFIG(ssl)
+    qmlRegisterSingletonType<HttpsServer>(
+            "Test.Shared", 1, 0, "HttpsServer",
+            [&](QQmlEngine *, QJSEngine *) { return new HttpsServer; });
+#endif
+
     int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR);
     return i;
 }