diff options
| author | Matt Fischer <matt.fischer@garmin.com> | 2013-02-28 16:52:12 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-29 11:30:03 (GMT) |
| commit | 87a840080732727c3017084a3fe8eb5acd30a746 (patch) | |
| tree | e004bcd57abc1a5416fa19633745bb258438c917 /LICENSE.LGPL | |
| parent | c1d70d12608e95f74966293730b49f2d07f2a84c (diff) | |
| download | Qt-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>
Diffstat (limited to 'LICENSE.LGPL')
0 files changed, 0 insertions, 0 deletions