projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec508e9
)
Include qobject_p.h from qmetaobject_p.h
author
Kent Hansen
<kent.hansen@nokia.com>
Sun, 27 May 2012 19:57:54 +0000
(21:57 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 31 May 2012 07:38:07 +0000
(09:38 +0200)
Needed for QObjectPrivate::Connection. Since it's a nested class,
it's not possible to merely forward declare it.
Change-Id: Ie2ad1b3972df5433cdb49ee443f053ba2d613779
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/corelib/kernel/qmetaobject_p.h
patch
|
blob
|
history
diff --git
a/src/corelib/kernel/qmetaobject_p.h
b/src/corelib/kernel/qmetaobject_p.h
index
5877ab1
..
320b8dd
100644
(file)
--- a/
src/corelib/kernel/qmetaobject_p.h
+++ b/
src/corelib/kernel/qmetaobject_p.h
@@
-55,6
+55,9
@@
#include <QtCore/qglobal.h>
#include <QtCore/qobjectdefs.h>
+#ifndef QT_NO_QOBJECT
+#include <private/qobject_p.h> // For QObjectPrivate::Connection
+#endif
QT_BEGIN_NAMESPACE