From 26ab02e91671548e2b55a16bb953b3d9e0a82497 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@kde.org>
Date: Mon, 29 May 2006 18:17:09 +0000
Subject:         * 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.

---
 qt/qdbusmacros.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'qt/qdbusmacros.h')

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
-- 
cgit