summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorThomas Sondergaard <ts@medical-insight.com>2010-05-04 12:58:49 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-04 12:58:49 (GMT)
commit3ff7825c6427d9b87f6eecf56e9b5e89e62f9056 (patch)
tree80cd97caaf2b533bb4a7a968ca82826fe370eb5a /src/dbus
parent3143c71cf2df5b2834817dc23e41e3fc5360e5c3 (diff)
downloadQt-3ff7825c6427d9b87f6eecf56e9b5e89e62f9056.zip
Qt-3ff7825c6427d9b87f6eecf56e9b5e89e62f9056.tar.gz
Qt-3ff7825c6427d9b87f6eecf56e9b5e89e62f9056.tar.bz2
Allow QtDBus to be compiled as a static library on Windows.
Merge-request: 569 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusmacros.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h
index 5447c33..144e44e 100644
--- a/src/dbus/qdbusmacros.h
+++ b/src/dbus/qdbusmacros.h
@@ -48,8 +48,10 @@
#if defined(QDBUS_MAKEDLL)
# define QDBUS_EXPORT Q_DECL_EXPORT
-#else
+#elif defined(QT_SHARED)
# define QDBUS_EXPORT Q_DECL_IMPORT
+#else
+# define QDBUS_EXPORT
#endif
#ifndef Q_MOC_RUN