diff options
| -rw-r--r-- | src/corelib/kernel/qguard_p.h | 9 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/corelib/kernel/qguard_p.h b/src/corelib/kernel/qguard_p.h index cbc9cca..6af01ac 100644 --- a/src/corelib/kernel/qguard_p.h +++ b/src/corelib/kernel/qguard_p.h @@ -54,7 +54,6 @@ // #include "QtCore/qglobal.h" -#include "private/qobject_p.h" QT_BEGIN_NAMESPACE @@ -93,6 +92,14 @@ protected: virtual void objectDestroyed(T *) {} }; +QT_END_NAMESPACE + +#include "private/qobject_p.h" + +QT_BEGIN_NAMESPACE + +inline void q_guard_addGuard(QGuard<QObject> *); +inline void q_guard_removeGuard(QGuard<QObject> *); template<class T> QGuard<T>::QGuard() diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 7e3e97d..54c98ad 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -60,7 +60,7 @@ #include "QtCore/qvector.h" #include "QtCore/qreadwritelock.h" #include "QtCore/qvariant.h" -#include "qguard_p.h" +#include "private/qguard_p.h" QT_BEGIN_NAMESPACE |