59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From ce8a5ec429efd173899f3a545ca527085c929daf Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Fri, 3 Feb 2017 19:36:25 +0100
|
|
Subject: [PATCH 09/33] Fix linking against static D-Bus
|
|
|
|
---
|
|
configure.json | 9 +++++++--
|
|
src/dbus/qdbus_symbols_p.h | 4 ++++
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.json b/configure.json
|
|
index 2dc79137e8..68fed05289 100644
|
|
--- a/configure.json
|
|
+++ b/configure.json
|
|
@@ -172,18 +172,23 @@
|
|
"CONFIG(debug, debug|release): \\",
|
|
" LIBS += $$LIBS_DEBUG",
|
|
"else: \\",
|
|
- " LIBS += $$LIBS_RELEASE"
|
|
+ " LIBS += $$LIBS_RELEASE",
|
|
+ "static: DEFINES += DBUS_STATIC_BUILD"
|
|
]
|
|
},
|
|
"sources": [
|
|
{ "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
|
|
+ {
|
|
+ "libs": "-ldbus-1 -lws2_32 -liphlpapi",
|
|
+ "condition": "config.win32 && !features.shared"
|
|
+ },
|
|
{
|
|
"libs": "",
|
|
"builds": {
|
|
"debug": "-ldbus-1d",
|
|
"release": "-ldbus-1"
|
|
},
|
|
- "condition": "config.win32"
|
|
+ "condition": "config.win32 && features.shared"
|
|
},
|
|
{ "libs": "-ldbus-1", "condition": "!config.win32" }
|
|
]
|
|
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
|
|
index 9eaebe6d7e..ac1b1d977b 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.19.0
|
|
|