From 18b42539e4262f14cc96913f34df05d10d7d7cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Lindstr=C3=B6m?= <hugolm84@gmail.com>
Date: Sun, 8 Dec 2019 16:03:58 +0800
Subject: [PATCH] Add QtWebKit as required dependency for Qt>5.6, fix cmake
 configuration errors on OSX

---
 README.md                      | 6 +++++-
 src/libtomahawk/CMakeLists.txt | 2 +-
 src/tomahawk/CMakeLists.txt    | 4 +---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4655f728d..4c1c709a9 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ You can download one of our nightly or stable builds:
 Required dependencies:
 
 * [CMake 3](http://www.cmake.org/)
-* [Qt 5.4.0](http://qt-project.org/)
+* [Qt >= 5.4.0](http://qt-project.org/)
 * [VLC 2.1.0](https://videolan.org/vlc/)
 * [SQLite 3.6.22](http://www.sqlite.org/)
 * [TagLib 1.8](https://taglib.github.io/)
@@ -90,6 +90,10 @@ Required dependencies:
 * [Sparsehash](https://code.google.com/p/sparsehash/)
 * [GnuTLS](http://gnutls.org/)
 
+If you are using Qt>5.6 you need to build and install QtWebKit
+
+* [QtWebKit](https://github.com/qt/qtwebkit)
+
 The following dependencies are optional (but *recommended*):
 
 * [Jreen 1.1.1](http://qutim.org/jreen/)
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index d264b66fd..348d6b1dd 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -494,7 +494,7 @@ target_link_libraries(${TOMAHAWK_LIBRARY} PUBLIC
     Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg
 )
 if(APPLE)
-    target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::MacExtras)
+    target_link_libraries(${TOMAHAWK_LIBRARY} PRIVATE Qt5::MacExtras)
 endif()
 
 IF(QCA2_FOUND)
diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt
index 373f295bc..53402861e 100644
--- a/src/tomahawk/CMakeLists.txt
+++ b/src/tomahawk/CMakeLists.txt
@@ -146,9 +146,7 @@ ENDIF()
 
 file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )
 if(APPLE)
-    # OUTFILE is currently only supported in my branch, see https://git.reviewboard.kde.org/r/126303/
-    # once merged (and released), we can remove this conditional usage
-    ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}")
+    ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS} SIDEBAR_ICONS ${TOMAHAWK_ICONS} OUTFILE "${TOMAHAWK_APPLICATION_NAME}")
 else()
     ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS})
 endif()