diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
| commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
| tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
| download | meta-qt5-19d99b10df41b7875b3c788bc7a9d1a88734e644.tar.gz | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch')
| -rw-r--r-- | recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch index da7561ce..25d1ae90 100644 --- a/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch +++ b/recipes-qt/qt5/qt5-creator/0001-Link-with-libexecinfo-on-musl.patch | |||
| @@ -11,16 +11,16 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
| 11 | 11 | ||
| 12 | --- a/src/plugins/debugger/debugger.pro | 12 | --- a/src/plugins/debugger/debugger.pro |
| 13 | +++ b/src/plugins/debugger/debugger.pro | 13 | +++ b/src/plugins/debugger/debugger.pro |
| 14 | @@ -139,3 +139,4 @@ include(console/console.pri) | 14 | @@ -140,3 +140,4 @@ include(console/console.pri) |
| 15 | include(analyzer/analyzer.pri) | 15 | include(analyzer/analyzer.pri) |
| 16 | 16 | ||
| 17 | include(shared/shared.pri) | 17 | include(shared/shared.pri) |
| 18 | +LIBS *= -lexecinfo | 18 | +LIBS *= -lexecinfo |
| 19 | --- a/src/plugins/qmldesigner/qmldesignerplugin.pro | 19 | --- a/src/plugins/qmldesigner/qmldesignerplugin.pro |
| 20 | +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro | 20 | +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro |
| 21 | @@ -3,7 +3,7 @@ CONFIG += exceptions | 21 | @@ -4,7 +4,7 @@ CONFIG += exceptions |
| 22 | |||
| 23 | INCLUDEPATH += $$PWD | 22 | INCLUDEPATH += $$PWD |
| 23 | INCLUDEPATH += $$PWD/components | ||
| 24 | 24 | ||
| 25 | -unix:!openbsd:!osx: LIBS += -lrt # posix shared memory | 25 | -unix:!openbsd:!osx: LIBS += -lrt # posix shared memory |
| 26 | +unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory | 26 | +unix:!openbsd:!osx: LIBS += -lexecinfo -lrt # posix shared memory |