blob: c6a59c2c68d4cc407e2d977dac46b7074c35a031 [file] [log] [blame] [edit]
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/configure.json qt-everywhere-src-5.12.4/qtbase/configure.json
--- qt-everywhere-src-5.12.4-orig/qtbase/configure.json 2019-06-12 23:59:14.000000000 +0300
+++ qt-everywhere-src-5.12.4/qtbase/configure.json 2019-06-15 15:11:51.548349600 +0300
@@ -169,18 +169,20 @@
"dbus": {
"label": "D-Bus >= 1.2",
"test": {
- "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
+ "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
+ "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
},
"headers": "dbus/dbus.h",
"sources": [
- { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
+ { "type": "pkgConfig", "args": "dbus-1 >= 1.2", "condition": "features.shared" },
+ { "type": "pkgConfig", "args": "--static dbus-1 >= 1.2", "condition": "!features.shared" },
{
"libs": "",
"builds": {
- "debug": "-ldbus-1d",
+ "debug": "-ldbus-1",
"release": "-ldbus-1"
},
- "condition": "config.win32"
+ "condition": "config.win32 && features.shared"
},
{ "libs": "-ldbus-1", "condition": "!config.win32" }
]
@@ -654,7 +659,7 @@
},
"pkg-config": {
"label": "Using pkg-config",
- "autoDetect": "!config.darwin && !config.win32",
+ "autoDetect": "!config.darwin && !config.msvc",
"condition": "tests.pkg-config",
"output": [
"publicFeature",
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/src/dbus/qdbus_symbols_p.h qt-everywhere-src-5.12.4/qtbase/src/dbus/qdbus_symbols_p.h
--- qt-everywhere-src-5.12.4-orig/qtbase/src/dbus/qdbus_symbols_p.h 2019-06-12 23:59:14.000000000 +0300
+++ qt-everywhere-src-5.12.4/qtbase/src/dbus/qdbus_symbols_p.h 2019-06-15 15:11:51.563949700 +0300
@@ -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