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:
7b95df2
)
qdbusmetatype_p.h: add missing QT_NO_DBUS guards
author
J-P Nurmi
<jpnurmi@digia.com>
Mon, 24 Sep 2012 13:20:20 +0000
(15:20 +0200)
committer
The Qt Project
<gerrit-noreply@qt-project.org>
Mon, 24 Sep 2012 19:28:40 +0000
(21:28 +0200)
Change-Id: Idb459fe6300f710b959247cd9c1997a4d5774b2d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/dbus/qdbusmetatype_p.h
patch
|
blob
|
history
diff --git
a/src/dbus/qdbusmetatype_p.h
b/src/dbus/qdbusmetatype_p.h
index
4ece56c
..
fd2b9c2
100644
(file)
--- a/
src/dbus/qdbusmetatype_p.h
+++ b/
src/dbus/qdbusmetatype_p.h
@@
-61,6
+61,8
@@
#include <qdbuserror.h>
#include <qdbusunixfiledescriptor.h>
+#ifndef QT_NO_DBUS
+
QT_BEGIN_NAMESPACE
struct QDBusMetaTypeId
@@
-107,4
+109,5
@@
inline int QDBusMetaTypeId::unixfd()
QT_END_NAMESPACE
+#endif // QT_NO_DBUS
#endif