summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fischer <matt.fischer@garmin.com>2013-02-28 16:52:12 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-29 11:30:03 (GMT)
commit87a840080732727c3017084a3fe8eb5acd30a746 (patch)
treee004bcd57abc1a5416fa19633745bb258438c917
parentc1d70d12608e95f74966293730b49f2d07f2a84c (diff)
downloadQt-87a840080732727c3017084a3fe8eb5acd30a746.zip
Qt-87a840080732727c3017084a3fe8eb5acd30a746.tar.gz
Qt-87a840080732727c3017084a3fe8eb5acd30a746.tar.bz2
Fixed -dbus-linked when cross-compiling from Windows
Since Windows doesn't have pkg-config, it doesn't get -ldbus-1 added to the command line automatically like Linux does. Code was present to deal with this case, however it was only configured to work when native-compiling Qt. The flag was not added when cross-compiling, meaning that -dbus-linked did not work correctly in that case. This patch changes the code to add the flag properly in both cases. Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9 Task-number: QTBUG-29984 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/dbus/dbus.pro8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 37e5925..56527ad 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -6,6 +6,12 @@ CONFIG += link_pkgconfig
DEFINES += QT_BUILD_DBUS_LIB \
DBUS_API_SUBJECT_TO_CHANGE
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
+
+isEmpty(QT_LIBS_DBUS) {
+ win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
+ else:QT_LIBS_DBUS += -ldbus-1
+}
+
contains(QT_CONFIG, dbus-linked) {
LIBS_PRIVATE += $$QT_LIBS_DBUS
DEFINES += QT_LINKED_LIBDBUS
@@ -25,8 +31,6 @@ win32 {
-ladvapi32 \
-lnetapi32 \
-luser32
- CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d
- else:LIBS_PRIVATE += -ldbus-1
}
include(../qbase.pri)
PUB_HEADERS = qdbusargument.h \