diff options
| author | Matt Fischer <matt.fischer@garmin.com> | 2013-02-28 10:52:12 -0600 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 21:28:34 +0100 |
| commit | c82b0815ec80b3750a110d47c68142bb448ddf56 (patch) | |
| tree | 06e65582ca50e5cb8b25a114271d9eb504bd06f6 /src | |
| parent | 84a1493b509994901cb336c93378b80ed82b6a2a (diff) | |
| download | qtbase-c82b0815ec80b3750a110d47c68142bb448ddf56.tar.gz qtbase-c82b0815ec80b3750a110d47c68142bb448ddf56.tar.bz2 qtbase-c82b0815ec80b3750a110d47c68142bb448ddf56.zip | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/dbus.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 5ad77ddf95..2e4119ba93 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -6,6 +6,8 @@ MODULE_CONFIG = dbusadaptors dbusinterfaces !isEmpty(DBUS_PATH) { INCLUDEPATH += $$DBUS_PATH/include QMAKE_LIBDIR += $$DBUS_PATH/lib + win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d + else:QT_LIBS_DBUS += -ldbus-1 } DEFINES += DBUS_API_SUBJECT_TO_CHANGE @@ -21,8 +23,6 @@ win32 { -ladvapi32 \ -lnetapi32 \ -luser32 - CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d - else:LIBS_PRIVATE += -ldbus-1 } QMAKE_DOCS = $$PWD/doc/qtdbus.qdocconf |