diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2021-10-07 15:32:05 +0300 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-10-08 12:25:45 +0300 |
| commit | 1ffd2e712f878c740d4f7b25c0604eafd481cb4f (patch) | |
| tree | b21b82d1b1ac36db5bf1de9c689f7a41e371fcec /recipes-qt/qt5/qtlocation_git.bb | |
| parent | 84d2b9fdae42c762c4f790992b6ed088afccf57f (diff) | |
| parent | b6680da369626c932afb784fb28836881cd0457a (diff) | |
Merge remote-tracking branch 'github/master' into lts-5.15
Task-number: QTBUG-96310
Change-Id: Iec7ca30851b8e4d172faa0066685259d050bfd74
Diffstat (limited to 'recipes-qt/qt5/qtlocation_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 184beeff..68cae5bf 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -27,7 +27,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152640/ -LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" QT_MODULE_BRANCH_MAPBOXGL = "upstream/qt-staging" |