diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-05-29 18:17:09 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-05-29 18:17:09 +0000 |
| commit | 26ab02e91671548e2b55a16bb953b3d9e0a82497 (patch) | |
| tree | 6618b0255fc1fc8c6b56ec3e9e13e0eea7aecccb /qt/qdbusmacros.h | |
| parent | 5bc9dc5cf03d05feb62f0e28e2d5e04faf33610b (diff) | |
* qt/*: Update the QtDBus bindings up to revision 546310 in
Subversion.
This adds the dbuscpp2xml tool, that parses a C++ header and
outputs a D-BUS Introspection XML.
Diffstat (limited to 'qt/qdbusmacros.h')
| -rw-r--r-- | qt/qdbusmacros.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qt/qdbusmacros.h b/qt/qdbusmacros.h index a0553275..5b3c7d30 100644 --- a/qt/qdbusmacros.h +++ b/qt/qdbusmacros.h @@ -37,7 +37,7 @@ # error Sorry, you need a compiler with support for template member functions to compile QtDBus. #endif -#if defined(DBUS_COMPILATION) && defined(QDBUS_MAKEDLL) +#if defined(QDBUS_MAKEDLL) # define QDBUS_EXPORT Q_DECL_EXPORT #else # define QDBUS_EXPORT Q_DECL_IMPORT @@ -46,8 +46,5 @@ #ifndef Q_MOC_RUN # define Q_ASYNC #endif -#ifndef QT_NO_KEYWORDS -# define async Q_ASYNC -#endif #endif |