From 0f19f571ee307dbe5fdebeb489d0c6cfcc8fa5ef Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 9 Jul 2020 14:09:06 +0200
Subject: CMake: Regenerate projects

We need the qt_add_tool changes to successfully configure qemu builds.
The rest of the changes are just to be in sync with the .pro files.

Change-Id: I7bcc08ac58f57a5761aedef09761428c55235289
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 .../auto/qml/qmltyperegistrar/.prev_CMakeLists.txt | 37 ++++++++++++++++++++++
 tests/auto/qml/qmltyperegistrar/CMakeLists.txt     |  3 +-
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt

(limited to 'tests/auto/qml/qmltyperegistrar')

diff --git a/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..65272b0c7f
--- /dev/null
+++ b/tests/auto/qml/qmltyperegistrar/.prev_CMakeLists.txt
@@ -0,0 +1,37 @@
+# Generated from qmltyperegistrar.pro.
+
+#####################################################################
+## tst_qmltyperegistrar Test:
+#####################################################################
+
+qt_add_test(tst_qmltyperegistrar
+    SOURCES
+        hppheader.hpp
+        noextheader
+        tst_qmltyperegistrar.cpp tst_qmltyperegistrar.h
+    INCLUDE_DIRECTORIES
+        foreign
+    PUBLIC_LIBRARIES
+        # Remove: Lforeign
+        Qt::Qml
+        foreign
+)
+
+#### Keys ignored in scope 2:.:.:tst_qmltyperegistrar.pro:<TRUE>:
+# QMLTYPES_FILENAME = "tst_qmltyperegistrar.qmltypes"
+# QML_FOREIGN_METATYPES = "foreign/foreign_metatypes.json"
+# QML_IMPORT_NAME = "QmlTypeRegistrarTest"
+# QML_IMPORT_VERSION = "1.0"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+set_target_properties(tst_qmltyperegistrar PROPERTIES
+    QT_QML_MODULE_VERSION 1.0
+    QT_QML_MODULE_URI QmlTypeRegistrarTest
+    QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes
+)
+
+qt6_qml_type_registration(tst_qmltyperegistrar)
+add_subdirectory(foreign)
diff --git a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
index 4bef156880..4af6313c65 100644
--- a/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
+++ b/tests/auto/qml/qmltyperegistrar/CMakeLists.txt
@@ -30,10 +30,9 @@ target_compile_definitions(tst_qmltyperegistrar PRIVATE BUILD_WITH_CMAKE) # spec
 #####################################################################
 
 set_target_properties(tst_qmltyperegistrar PROPERTIES
-    QT_QML_MODULE_INSTALL_QMLTYPES TRUE
     QT_QML_MODULE_VERSION 1.0
     QT_QML_MODULE_URI QmlTypeRegistrarTest
-    QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes # special case
+    QT_QMLTYPES_FILENAME tst_qmltyperegistrar.qmltypes
 )
 
 qt6_qml_type_registration(tst_qmltyperegistrar ${json_list}) # special case
-- 
cgit v1.2.3