44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
From f46f51482f05364b021d24352f7618f26d2d3794 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 14:07:02 +0200
|
|
Subject: [PATCH 11/25] Fix linking against static D-Bus
|
|
|
|
---
|
|
config.tests/unix/dbus/dbus.cpp | 4 ++++
|
|
src/dbus/qdbus_symbols_p.h | 4 ++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/config.tests/unix/dbus/dbus.cpp b/config.tests/unix/dbus/dbus.cpp
|
|
index 295c904..80d3e9c 100644
|
|
--- a/config.tests/unix/dbus/dbus.cpp
|
|
+++ b/config.tests/unix/dbus/dbus.cpp
|
|
@@ -37,6 +37,10 @@
|
|
**
|
|
****************************************************************************/
|
|
|
|
+#ifdef QT_STATIC
|
|
+# define DBUS_STATIC_BUILD
|
|
+#endif
|
|
+
|
|
#define DBUS_API_SUBJECT_TO_CHANGE
|
|
#include <dbus/dbus.h>
|
|
|
|
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
|
|
index fbeea61..8e73e9e 100644
|
|
--- a/src/dbus/qdbus_symbols_p.h
|
|
+++ b/src/dbus/qdbus_symbols_p.h
|
|
@@ -57,6 +57,10 @@
|
|
|
|
#ifndef QT_NO_DBUS
|
|
|
|
+#ifdef QT_STATIC
|
|
+# define DBUS_STATIC_BUILD
|
|
+#endif
|
|
+
|
|
#ifdef QT_LINKED_LIBDBUS
|
|
# include <dbus/dbus.h>
|
|
#else
|
|
--
|
|
2.10.2
|
|
|