aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-07-16 12:56:10 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-16 14:51:23 +0000
commitf79d3a4b44c8ab0e34448e3af6522ec678ada0f0 (patch)
tree4b56534efbfe7afe0106aed5a2e2c25a6c371a3c
parent2709cf0836ef19e08792af5fad5fc43b2c3d8837 (diff)
Remove unnecessary declarations of type registration functions
For generated plugins, we do not need to manually declare type registration functions. Change-Id: Iafd311375e4542a74fe2530e64e2b4bbe15af690 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 2d86fb686a3226bb84994e9f61c5d34f448f6e49) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/qqmlcoreglobal_p.h2
-rw-r--r--src/labs/animation/qqmlanimationglobal_p.h2
-rw-r--r--src/labs/folderlistmodel/qquickfolderlistmodelglobal_p.h2
-rw-r--r--src/labs/models/qqmlmodelsglobal_p.h2
-rw-r--r--src/labs/settings/qqmlsettingsglobal_p.h2
-rw-r--r--src/labs/wavefrontmesh/qqmlwavefrontmeshglobal_p.h2
-rw-r--r--src/particles/qtquickparticlesglobal_p.h2
-rw-r--r--src/qml/qtqmlglobal_p.h2
-rw-r--r--src/qmllocalstorage/qqmllocalstorageglobal_p.h2
-rw-r--r--src/qmlmodels/qtqmlmodelsglobal_p.h2
-rw-r--r--src/qmltest/quicktestglobal_p.h3
-rw-r--r--src/qmlworkerscript/qtqmlworkerscriptglobal_p.h2
-rw-r--r--src/qmlxmllistmodel/qtqmlxmllistmodelglobal_p.h2
-rw-r--r--src/quicklayouts/qquicklayoutglobal_p.h2
14 files changed, 0 insertions, 29 deletions
diff --git a/src/core/qqmlcoreglobal_p.h b/src/core/qqmlcoreglobal_p.h
index 85dc15b095..f97e7df911 100644
--- a/src/core/qqmlcoreglobal_p.h
+++ b/src/core/qqmlcoreglobal_p.h
@@ -69,6 +69,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_QMLCORE_PRIVATE_EXPORT qml_register_types_QtCore();
-
#endif // QQMLCOREGLOBAL_P_H
diff --git a/src/labs/animation/qqmlanimationglobal_p.h b/src/labs/animation/qqmlanimationglobal_p.h
index 9ba3ecea2a..445ca8b136 100644
--- a/src/labs/animation/qqmlanimationglobal_p.h
+++ b/src/labs/animation/qqmlanimationglobal_p.h
@@ -68,6 +68,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_LABSANIMATION_PRIVATE_EXPORT qml_register_types_Qt_labs_animation();
-
#endif // QTLABSANIMATIONGLOBAL_P_H
diff --git a/src/labs/folderlistmodel/qquickfolderlistmodelglobal_p.h b/src/labs/folderlistmodel/qquickfolderlistmodelglobal_p.h
index c8df4e9ff7..578ea49fcd 100644
--- a/src/labs/folderlistmodel/qquickfolderlistmodelglobal_p.h
+++ b/src/labs/folderlistmodel/qquickfolderlistmodelglobal_p.h
@@ -68,6 +68,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_LABSFOLDERMODEL_PRIVATE_EXPORT qml_register_types_Qt_labs_folderlistmodel();
-
#endif // QTLABSFOLDERLISTMODELGLOBAL_P_H
diff --git a/src/labs/models/qqmlmodelsglobal_p.h b/src/labs/models/qqmlmodelsglobal_p.h
index ceb7ac1f55..46638b0442 100644
--- a/src/labs/models/qqmlmodelsglobal_p.h
+++ b/src/labs/models/qqmlmodelsglobal_p.h
@@ -68,6 +68,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_LABSQMLMODELS_PRIVATE_EXPORT qml_register_types_Qt_labs_qmlmodels();
-
#endif // QTLABSQMLMODELSGLOBAL_P_H
diff --git a/src/labs/settings/qqmlsettingsglobal_p.h b/src/labs/settings/qqmlsettingsglobal_p.h
index c0bea2585e..16a90de5a6 100644
--- a/src/labs/settings/qqmlsettingsglobal_p.h
+++ b/src/labs/settings/qqmlsettingsglobal_p.h
@@ -68,6 +68,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_LABSSETTINGS_PRIVATE_EXPORT qml_register_types_Qt_labs_settings();
-
#endif // QTLABSSETTINGSGLOBAL_P_H
diff --git a/src/labs/wavefrontmesh/qqmlwavefrontmeshglobal_p.h b/src/labs/wavefrontmesh/qqmlwavefrontmeshglobal_p.h
index ca57c1f7f3..81296535b4 100644
--- a/src/labs/wavefrontmesh/qqmlwavefrontmeshglobal_p.h
+++ b/src/labs/wavefrontmesh/qqmlwavefrontmeshglobal_p.h
@@ -68,6 +68,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_LABSWAVEFRONTMESH_PRIVATE_EXPORT qml_register_types_Qt_labs_wavefrontmesh();
-
#endif // QTLABSWAVEFRONTMESHGLOBAL_P_H
diff --git a/src/particles/qtquickparticlesglobal_p.h b/src/particles/qtquickparticlesglobal_p.h
index 927bc29050..d7647b3d97 100644
--- a/src/particles/qtquickparticlesglobal_p.h
+++ b/src/particles/qtquickparticlesglobal_p.h
@@ -65,6 +65,4 @@
# define Q_QUICKPARTICLES_PRIVATE_EXPORT
#endif
-void Q_QUICKPARTICLES_PRIVATE_EXPORT qml_register_types_QtQuick_Particles();
-
#endif // QTQUICKPARTICLESGLOBAL_P_H
diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h
index 0bdad8f08f..4c0ba338d8 100644
--- a/src/qml/qtqmlglobal_p.h
+++ b/src/qml/qtqmlglobal_p.h
@@ -59,8 +59,6 @@
#define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT
-void Q_QML_PRIVATE_EXPORT qml_register_types_QtQml();
-
#if !defined(QT_QMLDEVTOOLS_LIB) && !defined(QT_BUILD_QMLDEVTOOLS_LIB)
# define Q_QML_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
#else
diff --git a/src/qmllocalstorage/qqmllocalstorageglobal_p.h b/src/qmllocalstorage/qqmllocalstorageglobal_p.h
index 5eb13cce68..fb921518f4 100644
--- a/src/qmllocalstorage/qqmllocalstorageglobal_p.h
+++ b/src/qmllocalstorage/qqmllocalstorageglobal_p.h
@@ -70,6 +70,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_QMLLOCALSTORAGE_PRIVATE_EXPORT qml_register_types_QtQuick_LocalStorage();
-
#endif // QQMLLOCALSTORAGEGLOBAL_P_H
diff --git a/src/qmlmodels/qtqmlmodelsglobal_p.h b/src/qmlmodels/qtqmlmodelsglobal_p.h
index 1a1157138d..145112c9c1 100644
--- a/src/qmlmodels/qtqmlmodelsglobal_p.h
+++ b/src/qmlmodels/qtqmlmodelsglobal_p.h
@@ -58,6 +58,4 @@
#define Q_QMLMODELS_PRIVATE_EXPORT Q_QMLMODELS_EXPORT
#define Q_QMLMODELS_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
-void Q_QMLMODELS_PRIVATE_EXPORT qml_register_types_QtQml_Models();
-
#endif // QTQMLMODELSGLOBAL_P_H
diff --git a/src/qmltest/quicktestglobal_p.h b/src/qmltest/quicktestglobal_p.h
index 4a70c2478d..0327f73b4c 100644
--- a/src/qmltest/quicktestglobal_p.h
+++ b/src/qmltest/quicktestglobal_p.h
@@ -55,7 +55,4 @@
#define Q_QUICK_TEST_PRIVATE_EXPORT Q_QUICK_TEST_EXPORT
-void Q_QUICK_TEST_PRIVATE_EXPORT qml_register_types_QtTest();
-
-
#endif // QUICKTESTGLOBAL_P_H
diff --git a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h
index c75d5f3129..34236cd79e 100644
--- a/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h
+++ b/src/qmlworkerscript/qtqmlworkerscriptglobal_p.h
@@ -57,6 +57,4 @@
#define Q_QMLWORKERSCRIPT_PRIVATE_EXPORT Q_QMLWORKERSCRIPT_EXPORT
#define Q_QMLWORKERSCRIPT_AUTOTEST_EXPORT Q_AUTOTEST_EXPORT
-void Q_QMLWORKERSCRIPT_PRIVATE_EXPORT qml_register_types_QtQml_WorkerScript();
-
#endif // QTQMLWORKERSCRIPTGLOBAL_P_H
diff --git a/src/qmlxmllistmodel/qtqmlxmllistmodelglobal_p.h b/src/qmlxmllistmodel/qtqmlxmllistmodelglobal_p.h
index 068732cc05..d124891ef3 100644
--- a/src/qmlxmllistmodel/qtqmlxmllistmodelglobal_p.h
+++ b/src/qmlxmllistmodel/qtqmlxmllistmodelglobal_p.h
@@ -69,6 +69,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_QMLXMLLISTMODEL_PRIVATE_EXPORT qml_register_types_QtQml_XmlListModel();
-
#endif // QTQMLXMLLISTMODELGLOBAL_P_H
diff --git a/src/quicklayouts/qquicklayoutglobal_p.h b/src/quicklayouts/qquicklayoutglobal_p.h
index c63169bd93..7163d5a0d4 100644
--- a/src/quicklayouts/qquicklayoutglobal_p.h
+++ b/src/quicklayouts/qquicklayoutglobal_p.h
@@ -70,6 +70,4 @@ QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
-void Q_QUICKLAYOUT_PRIVATE_EXPORT qml_register_types_QtQuick_Layouts();
-
#endif // QQUICKLAYOUTGLOBAL_P_H