From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 14 Aug 2020 22:48:41 +0000 (+0300)
Subject: move qt_register_signal_spy_callbacks() implementation to qobject source
X-Git-Tag: 4.12.0~3575
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1710ae2b38b734333b1ee8a0b8a4585542b6ef8;p=kde%2FKatie.git

move qt_register_signal_spy_callbacks() implementation to qobject source

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 7b995663c..fded72d68 100644
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -103,15 +103,6 @@ void QCoreApplicationPrivate::processCommandLineArguments()
     }
 }
 
-// Support for introspection
-
-QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0 };
-
-void qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set)
-{
-    qt_signal_spy_callback_set = callback_set;
-}
-
 typedef QList<QtCleanUpFunction> QVFuncList;
 Q_GLOBAL_STATIC(QVFuncList, postRList)
 
diff --git a/src/core/kernel/qobject.cpp b/src/core/kernel/qobject.cpp
index 88d8f215a..a76a4ee1a 100644
--- a/src/core/kernel/qobject.cpp
+++ b/src/core/kernel/qobject.cpp
@@ -57,6 +57,14 @@
 
 QT_BEGIN_NAMESPACE
 
+// Support for introspection
+QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0 };
+
+void qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set)
+{
+    qt_signal_spy_callback_set = callback_set;
+}
+
 static int DIRECT_CONNECTION_ONLY = 0;
 
 static int *queuedConnectionTypes(const QList<QByteArray> &typeNames)