qt5-creator: fix bad merge

Take the correct version of the patch that was left out in
the latest merge.

Change-Id: I780a57f149d90de2b56a4d1366ce71d26da7f484
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

1 files changed, 19 insertions, 5 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 214a4034..d17f60b4 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
@@ -1,4 +1,4 @@
-From 33299724b8719d53b26c9055a76a61c358270110 Mon Sep 17 00:00:00 2001
+From ec7aec2f6c56889c96dc12af46059a7f3d4c3a37 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 16 Jan 2018 13:26:57 +0000
 Subject: [PATCH] Link with libexecinfo on musl
@@ -6,15 +6,29 @@ Subject: [PATCH] Link with libexecinfo on musl
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- src/plugins/debugger/debugger.pro | 1 +
- 1 file changed, 1 insertion(+)
+ src/plugins/debugger/debugger.pro                         | 1 +
+ src/plugins/qmldesigner/designercore/designercore-lib.pri | 2 ++
+ 2 files changed, 3 insertions(+)
 
 diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
-index acbf5136b9..159139eb2b 100644
+index f5a34aa0d5..4a1359dd5c 100644
 --- a/src/plugins/debugger/debugger.pro
 +++ b/src/plugins/debugger/debugger.pro
-@@ -139,3 +139,4 @@ include(console/console.pri)
+@@ -141,3 +141,4 @@ include(console/console.pri)
  include(analyzer/analyzer.pri)
  
  include(shared/shared.pri)
 +LIBS  *= -lexecinfo
+diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri
+index 935b29728e..31527267fd 100644
+--- a/src/plugins/qmldesigner/designercore/designercore-lib.pri
++++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri
+@@ -2,6 +2,8 @@ include($$PWD/filemanager/filemanager.pri)
+ 
+ QT += network
+ 
++LIBS *= -lexecinfo
++
+ DEFINES += TEST_EXPORTS
+ DEFINES += DESIGNER_CORE_LIBRARY
+ INCLUDEPATH += $$PWD \