From 8c0e072c5a9b40370d458801fe5c9879197dffdb Mon Sep 17 00:00:00 2001
From: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Date: Mon, 26 Aug 2019 16:09:23 +0200
Subject: Fix KUserFeedback lib names on Mac

Also rearrange code a bit to improve readability.

Task-number: QTCREATORBUG-22861
Change-Id: I1333d7238b4efe556f8e5a339988818edafa760e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 usagestatistic.pro | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/usagestatistic.pro b/usagestatistic.pro
index d0061c9..6327697 100644
--- a/usagestatistic.pro
+++ b/usagestatistic.pro
@@ -1,11 +1,8 @@
 DEFINES += USAGESTATISTIC_LIBRARY
 
-KUSERFEEDBACK_SOURCE_PATH  = "$${PWD}/3rdparty/kuserfeedback"
-KUSERFEEDBACK_BUILD_PATH   = "$${OUT_PWD}/kuserfeedback/build"
-KUSERFEEDBACK_INSTALL_PATH = "$${OUT_PWD}/kuserfeedback"
+KUSERFEEDBACK_SOURCE_PATH = "$${PWD}/3rdparty/kuserfeedback"
 
 INCLUDEPATH *= "$${KUSERFEEDBACK_INSTALL_PATH}/include" "$${PWD}"
-LIBS *= -L"$${KUSERFEEDBACK_INSTALL_PATH}/lib" -lKUserFeedbackCore -lKUserFeedbackWidgets -lKUserFeedbackCommon
 
 CONFIG += c++1z
 QMAKE_CXXFLAGS *= -Wall -Wextra -pedantic
@@ -103,9 +100,14 @@ QTC_PLUGIN_RECOMMENDS += \
     system("$${EXTRA_CMAKE_MODULES_BUILD_CMD}")
 
     # Configure KUserFeedback
+    KUSERFEEDBACK_BUILD_PATH   = "$${OUT_PWD}/kuserfeedback/build"
+    KUSERFEEDBACK_INSTALL_PATH = "$${OUT_PWD}/kuserfeedback"
+
     CMAKE_PREFIX_PATHS = "$$shell_path($$[QT_INSTALL_LIBS]/cmake);$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH}/share/ECM/cmake)"
+
     BUILD_TYPE = Debug
     CONFIG(release, debug|release): BUILD_TYPE = Release
+
     system("cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \
                   -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \
                   -DBUILD_SHARED_LIBS=OFF \
@@ -130,6 +132,12 @@ QTC_PLUGIN_RECOMMENDS += \
 
 include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
 
+# Put it here to use qtLibraryName function without extra hacks
+LIBS *= -L"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH}/lib)" \
+            -l$$qtLibraryName(KUserFeedbackCore)             \
+            -l$$qtLibraryName(KUserFeedbackWidgets)          \
+            -l$$qtLibraryName(KUserFeedbackCommon)
+
 FORMS += \
     ui/usagestatisticwidget.ui \
     ui/encouragementwidget.ui
-- 
cgit v1.2.3