aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/qtquickglobal_p.h
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2022-01-25 10:44:45 +0100
committerUlf Hermann <[email protected]>2022-02-01 09:34:19 +0100
commit25aab20ad3fa63acc7d76be022a4303f005a9f8a (patch)
treeb2adeb5e2e1aa81a2b39e8abb42101ac8f6b3640 /src/quick/qtquickglobal_p.h
parent7efcb0e34933ee6ac29f9de35c0fe7146049c221 (diff)
Move registrations functions into the Qt namespace
It's high time we do this. We should not clobber the global namespace with type registration functions if the user has explicitly provided a namespace for Qt. Change-Id: Ibac49cb1c8976e65ea15d7a07d25ea1a5325a60a Reviewed-by: Andrei Golubev <[email protected]> Reviewed-by: Shawn Rutledge <[email protected]> Reviewed-by: Fabian Kosmale <[email protected]>
Diffstat (limited to 'src/quick/qtquickglobal_p.h')
-rw-r--r--src/quick/qtquickglobal_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/qtquickglobal_p.h b/src/quick/qtquickglobal_p.h
index 5f10c69ed8..a6079c087e 100644
--- a/src/quick/qtquickglobal_p.h
+++ b/src/quick/qtquickglobal_p.h
@@ -60,10 +60,10 @@
#include "qtquickglobal.h"
#include <QtQuick/private/qtquickexports_p.h>
-void Q_QUICK_PRIVATE_EXPORT qml_register_types_QtQuick();
-
QT_BEGIN_NAMESPACE
+void Q_QUICK_PRIVATE_EXPORT qml_register_types_QtQuick();
+
void Q_QUICK_PRIVATE_EXPORT QQuick_initializeModule();
Q_DECLARE_LOGGING_CATEGORY(lcTouch)