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-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch')
| -rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch deleted file mode 100644 index 1e37bf55..00000000 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9692239a31f0e47ea75b60388d5491d5155a888d Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@saftware.de> -Date: Mon, 17 Dec 2018 14:00:44 +0100 -Subject: [PATCH] Fix library path for multilib setups. - -Upstream-Status: Pending - -Signed-off-by: Andreas Oberritter <obi@saftware.de> ---- - libconnman-qt/libconnman-qt.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro -index 8cd58e8..bad8a5e 100644 ---- a/libconnman-qt/libconnman-qt.pro -+++ b/libconnman-qt/libconnman-qt.pro -@@ -71,7 +71,7 @@ SOURCES += \ - networksession.cpp \ - counter.cpp - --target.path = $$INSTALL_ROOT$$PREFIX/lib -+target.path = $$[QT_INSTALL_LIBS] - - headers.files = $$PUBLIC_HEADERS - |