2 files changed, 25 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index e3b25f8bf7..1540ebfe12 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -4526,6 +4526,24 @@ QDebug operator<<(QDebug dbg, const QObject *o)
     Q_NAMESPACE makes an external variable, \c{staticMetaObject}, available.
     \c{staticMetaObject} is of type QMetaObject and provides access to the
     enums declared with Q_ENUM_NS/Q_FLAG_NS.
+
+    \sa Q_NAMESPACE_EXPORT
+*/
+
+/*!
+    \macro Q_NAMESPACE_EXPORT(EXPORT_MACRO)
+    \relates QObject
+    \since 5.14
+
+    The Q_NAMESPACE_EXPORT macro can be used to add QMetaObject capabilities
+    to a namespace.
+
+    It works exactly like the Q_NAMESPACE macro. However, the external
+    \c{staticMetaObject} variable that gets defined in the namespace
+    is declared with the supplied \c{EXPORT_MACRO} qualifier. This is
+    useful f.i. if the object needs to be exported from a dynamic library.
+
+    \sa Q_NAMESPACE, {Creating Shared Libraries}
 */
 
 /*!
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 4d5ac4dcb2..ef22b6e67f 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -201,12 +201,16 @@ private: \
     QT_ANNOTATE_CLASS(qt_qgadget, "") \
     /*end*/
 
-/* qmake ignore Q_NAMESPACE */
-#define Q_NAMESPACE \
-    extern const QMetaObject staticMetaObject; \
+/* qmake ignore Q_NAMESPACE_EXPORT */
+#define Q_NAMESPACE_EXPORT(...) \
+    extern __VA_ARGS__ const QMetaObject staticMetaObject; \
     QT_ANNOTATE_CLASS(qt_qnamespace, "") \
     /*end*/
 
+/* qmake ignore Q_NAMESPACE */
+#define Q_NAMESPACE Q_NAMESPACE_EXPORT() \
+    /*end*/
+
 #endif // QT_NO_META_MACROS
 
 #else // Q_MOC_RUN