aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Goldstein <[email protected]>2021-04-27 10:05:22 +0200
committerMaximilian Goldstein <[email protected]>2021-04-27 11:22:09 +0200
commit6850da55d7d6f098de76bb2098d8bb010870aff5 (patch)
tree4d652928ce12e9c31542d4965a04f3b1bdb32cf1
parent077b8f8df437d1cfcf67b153dd4535c36786bdee (diff)
CMake: Remove GENERATE_METATYPES usage
We now generate metatypes by default and every instance of GENERATE_METATYPES now causes a warning. Change-Id: Id81f66eb8b0b7cc9475fd9978ebe374a59ab7b63 Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Ulf Hermann <[email protected]>
-rw-r--r--src/core/CMakeLists.txt1
-rw-r--r--src/labs/animation/CMakeLists.txt1
-rw-r--r--src/labs/folderlistmodel/CMakeLists.txt1
-rw-r--r--src/labs/models/CMakeLists.txt1
-rw-r--r--src/labs/settings/CMakeLists.txt1
-rw-r--r--src/labs/sharedimage/CMakeLists.txt1
-rw-r--r--src/labs/wavefrontmesh/CMakeLists.txt1
-rw-r--r--src/particles/CMakeLists.txt1
-rw-r--r--src/qml/CMakeLists.txt1
-rw-r--r--src/qmllocalstorage/CMakeLists.txt1
-rw-r--r--src/qmlmodels/CMakeLists.txt1
-rw-r--r--src/qmltest/CMakeLists.txt1
-rw-r--r--src/qmlworkerscript/CMakeLists.txt1
-rw-r--r--src/qmlxmllistmodel/CMakeLists.txt1
-rw-r--r--src/quick/CMakeLists.txt1
-rw-r--r--src/quicklayouts/CMakeLists.txt1
-rw-r--r--src/quickshapes/CMakeLists.txt1
17 files changed, 0 insertions, 17 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 500c73e8c5..5464524d10 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(QmlCore
- GENERATE_METATYPES
SOURCES
qqmlstandardpaths_p.h
qqmlstandardpaths.cpp
diff --git a/src/labs/animation/CMakeLists.txt b/src/labs/animation/CMakeLists.txt
index 6c1cdcae14..2985139bf0 100644
--- a/src/labs/animation/CMakeLists.txt
+++ b/src/labs/animation/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsAnimation
- GENERATE_METATYPES
SOURCES
qquickboundaryrule.cpp qquickboundaryrule_p.h
qqmlanimationglobal_p.h
diff --git a/src/labs/folderlistmodel/CMakeLists.txt b/src/labs/folderlistmodel/CMakeLists.txt
index 6994bbf658..fb6e47e154 100644
--- a/src/labs/folderlistmodel/CMakeLists.txt
+++ b/src/labs/folderlistmodel/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsFolderListModel
- GENERATE_METATYPES
SOURCES
fileinfothread.cpp fileinfothread_p.h
fileproperty_p.h
diff --git a/src/labs/models/CMakeLists.txt b/src/labs/models/CMakeLists.txt
index 774513d8c6..98fdf0aa74 100644
--- a/src/labs/models/CMakeLists.txt
+++ b/src/labs/models/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsQmlModels
- GENERATE_METATYPES
SOURCES
qqmlmodelsglobal_p.h
DEFINES
diff --git a/src/labs/settings/CMakeLists.txt b/src/labs/settings/CMakeLists.txt
index 4dc99ea7d8..c323e6f9ce 100644
--- a/src/labs/settings/CMakeLists.txt
+++ b/src/labs/settings/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsSettings
- GENERATE_METATYPES
SOURCES
qqmlsettings.cpp qqmlsettings_p.h
qqmlsettingsglobal_p.h
diff --git a/src/labs/sharedimage/CMakeLists.txt b/src/labs/sharedimage/CMakeLists.txt
index a360fc1002..e1b4706043 100644
--- a/src/labs/sharedimage/CMakeLists.txt
+++ b/src/labs/sharedimage/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsSharedImage
- GENERATE_METATYPES
SOURCES
qsharedimageloader.cpp qsharedimageloader_p.h
qsharedimageprovider.cpp qsharedimageprovider_p.h
diff --git a/src/labs/wavefrontmesh/CMakeLists.txt b/src/labs/wavefrontmesh/CMakeLists.txt
index df02526af4..718bf09624 100644
--- a/src/labs/wavefrontmesh/CMakeLists.txt
+++ b/src/labs/wavefrontmesh/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(LabsWavefrontMesh
- GENERATE_METATYPES
SOURCES
qwavefrontmesh.cpp qwavefrontmesh_p.h
qqmlwavefrontmeshglobal_p.h
diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt
index 830b86b4e6..dbee246c2c 100644
--- a/src/particles/CMakeLists.txt
+++ b/src/particles/CMakeLists.txt
@@ -6,7 +6,6 @@
qt_internal_add_module(QuickParticles
INTERNAL_MODULE
- GENERATE_METATYPES
SOURCES
qquickage.cpp qquickage_p.h
qquickangledirection.cpp qquickangledirection_p.h
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index 84c3a4c658..ce62e48ca0 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_internal_add_module(Qml
- GENERATE_METATYPES
PLUGIN_TYPES qmltooling
SOURCES
../3rdparty/masm/assembler/ARM64Assembler.h
diff --git a/src/qmllocalstorage/CMakeLists.txt b/src/qmllocalstorage/CMakeLists.txt
index 9a4d5f048b..adf07345dd 100644
--- a/src/qmllocalstorage/CMakeLists.txt
+++ b/src/qmllocalstorage/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(QmlLocalStorage
- GENERATE_METATYPES
SOURCES
qqmllocalstorage.cpp qqmllocalstorage_p.h
qqmllocalstorageglobal_p.h
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 6f613f2d68..23edc3fc3f 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_internal_add_module(QmlModels
- GENERATE_METATYPES
SOURCES
qqmlchangeset.cpp qqmlchangeset_p.h
qqmlmodelsmodule_p.h
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index afeebd3189..5c14dacae5 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -6,7 +6,6 @@
qt_internal_add_module(QuickTest
CONFIG_MODULE_NAME qmltest
- GENERATE_METATYPES
QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG}
SOURCES
qtestoptions_p.h
diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt
index 4b9b2ebcd5..6716301b90 100644
--- a/src/qmlworkerscript/CMakeLists.txt
+++ b/src/qmlworkerscript/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_internal_add_module(QmlWorkerScript
- GENERATE_METATYPES
SOURCES
qquickworkerscript.cpp qquickworkerscript_p.h
qtqmlworkerscriptglobal.h qtqmlworkerscriptglobal_p.h
diff --git a/src/qmlxmllistmodel/CMakeLists.txt b/src/qmlxmllistmodel/CMakeLists.txt
index 9a6cae35e5..453d0348fc 100644
--- a/src/qmlxmllistmodel/CMakeLists.txt
+++ b/src/qmlxmllistmodel/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(QmlXmlListModel
- GENERATE_METATYPES
SOURCES
qqmlxmllistmodel_p.h qqmlxmllistmodel.cpp
qtqmlxmllistmodelglobal_p.h
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index 39ae6600c8..03eb3ee768 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_internal_add_module(Quick
- GENERATE_METATYPES
PLUGIN_TYPES scenegraph
SOURCES
handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h
diff --git a/src/quicklayouts/CMakeLists.txt b/src/quicklayouts/CMakeLists.txt
index 4ba60c0390..ca5dbfad79 100644
--- a/src/quicklayouts/CMakeLists.txt
+++ b/src/quicklayouts/CMakeLists.txt
@@ -1,5 +1,4 @@
qt_internal_add_module(QuickLayouts
- GENERATE_METATYPES
SOURCES
qquickgridlayoutengine.cpp qquickgridlayoutengine_p.h
qquicklayout.cpp qquicklayout_p.h
diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt
index 3e8fbc4173..b8838b6a18 100644
--- a/src/quickshapes/CMakeLists.txt
+++ b/src/quickshapes/CMakeLists.txt
@@ -6,7 +6,6 @@
qt_internal_add_module(QuickShapes
INTERNAL_MODULE
- GENERATE_METATYPES
SOURCES
qquickshape.cpp qquickshape_p.h
qquickshape_p_p.h