From 1237ea8bac2f5fd055553b45eae296fd44abd3e8 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Mon, 27 Jul 2009 16:35:38 +0200 Subject: Fixed missing forward declarations, which made gcc fail to compile anything that included qobject.h Reviewed-by: Thomas Hartmann (cherry picked from commit cc287101308fa606eb4de2597b5309c8099654c3) --- src/corelib/kernel/qguard_p.h | 9 ++++++++- 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 *); +inline void q_guard_removeGuard(QGuard *); template QGuard::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 -- cgit v0.12