Update README.md

Finally removing OpenSUSE guide.
Update Build Instructions
2025-09-06 20:20:41 +02:00 · 2020-09-08 16:35:31 +02:00 · 2020-09-07 16:08:07 +02:00 · 2020-07-23 13:44:21 +02:00 · 2020-07-23 02:00:27 +02:00 · 2020-07-23 02:00:27 +02:00
2544 changed files with 212835 additions and 547343 deletions
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -0,0 +1,16 @@
+name: C/C++ CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: tomahawkmusicplayer/ubuntu:latest
+      env:
+        MIX_ENV: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@master
+      - name: Build and test
+        run: /usr/local/bin/build-and-test.sh
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ Makefile*
 moc_*
 *~
 /tomahawk
-thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
 *.kdev4
 *.kate-swp
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "thirdparty/libcrashreporter-qt"]
+	path = thirdparty/libcrashreporter-qt
+	url = https://github.com/dschmidt/libcrashreporter-qt
--- a/.tx/config
+++ b/.tx/config
@@ -1,5 +1,5 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com

 [tomahawk.tomahawk-master]
 file_filter = lang/tomahawk_<lang>.ts
--- a/1
+++ b/1
@@ -14,6 +14,7 @@ Contributors include:
 * Michael Zanetti <dreadhead@follefuder.org>
 * Christopher Reichert <christopher@tomahawk-player.org>
 * Uwe L. Korn <uwelk@xhochy.com>
+* Patrick von Reth <vonreth@kde.org>

 Thanks to:

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,30 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
-SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 CMAKE_POLICY(SET CMP0017 NEW)
+CMAKE_POLICY(SET CMP0022 NEW)
+IF(POLICY CMP0075)
+    CMAKE_POLICY(SET CMP0075 NEW)
+ENDIF()
+
+# TODO:
+# Update to NEW and fix things up
+CMAKE_POLICY(SET CMP0023 NEW)
+
+# Let AUTOMOC and AUTOUIC process generated files
+IF(POLICY CMP0071)
+    CMAKE_POLICY(SET CMP0071 NEW)
+ENDIF()
+
+# TODO:
+# Disable automatic qtmain linking
+CMAKE_POLICY(SET CMP0020 OLD)
+
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ${ECM_MODULE_PATH})
+
+
+
+INCLUDE(CMakeDependentOption)

 ###
 ### Tomahawk application info
@@ -10,6 +33,14 @@ SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
 SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
+SET( TOMAHAWK_APPLICATION_PACKAGE_NAME "org.tomahawk-player.Tomahawk")
+IF(APPLE)
+    SET( TOMAHAWK_TARGET_NAME "Tomahawk" )
+ELSE()
+    SET( TOMAHAWK_TARGET_NAME "tomahawk" )
+ENDIF()
+
+STRING(TOLOWER "${TOMAHAWK_TARGET_NAME}" TOMAHAWK_BASE_TARGET_NAME)

 IF( WIN32 )
    SET( TOMAHAWK_SYSTEM "Windows" )
@@ -22,72 +53,103 @@ ELSE()
 ENDIF()

 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 7 )
-SET( TOMAHAWK_VERSION_PATCH 100 )
-#SET( TOMAHAWK_VERSION_RC 0 )
+SET( TOMAHAWK_VERSION_MINOR 8 )
+SET( TOMAHAWK_VERSION_PATCH 99 )
+SET( TOMAHAWK_VERSION_RC 0 )

-SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ru sv tr zh_CN zh_TW )
+SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs da de en el es es_419 fi fr hi_IN hu gl id it ja lt nl pl pt_BR pt_PT ro ru sq sv th tr uk vi zh_CN zh_TW )
+
+# add_definitions is only in the scope of this directory and all directories
+# below it. Tomahawk Libraries and plugins that are built with Tomahawk are
+# not included in out-of-source build so we need to re-add_definitions there.
+macro(tomahawk_add_definitions DEFINITION)
+    add_definitions( ${DEFINITION} )
+    set( TOMAHAWK_DEFINITIONS "${TOMAHAWK_DEFINITIONS} ${DEFINITION}")
+endmacro()
+
+macro(tomahawk_add_cxx_flags FLAGS)
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
+    set( TOMAHAWK_CXX_FLAGS "${TOMAHAWK_CXX_FLAGS} ${FLAGS}")
+endmacro()
+
+macro(tomahawk_add_c_flags FLAGS)
+    set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
+    set( TOMAHAWK_C_FLAGS "${TOMAHAWK_C_FLAGS} ${FLAGS}")
+endmacro()
+
+if(NOT WIN32)
+    # enforce proper symbol exporting on all platforms but Windows
+    tomahawk_add_cxx_flags( "-fvisibility=hidden" )
+    tomahawk_add_c_flags( "-fvisibility=hidden" )
+endif()

-# enforce proper symbol exporting on all platforms
-add_definitions( "-fvisibility=hidden" )
 # enforce using constBegin, constEnd for const-iterators
-add_definitions( "-DQT_STRICT_ITERATORS" )
+tomahawk_add_definitions( "-DQT_STRICT_ITERATORS" )

 # build options
-option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(BUILD_TESTS "Build Tomahawk with unit tests" ON)
+if(BUILD_RELEASE)
+    set(BUILD_NO_RELEASE OFF)
+else()
+    set(BUILD_NO_RELEASE ON)
+endif()
+
+option(BUILD_GUI "Build Tomahawk with GUI" ON)
+option(BUILD_TESTS "Build Tomahawk with unit tests" ${BUILD_NO_RELEASE})
+option(BUILD_TOOLS "Build Tomahawk helper tools" ${BUILD_NO_RELEASE})
 option(BUILD_HATCHET "Build the Hatchet plugin" OFF)

-option(WITH_BREAKPAD "Build with breakpad integration" ON)
-option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
+if(UNIX AND NOT APPLE)
+       set(CRASHREPORTER_ENABLED_BY_DEFAULT OFF)
+else()
+       set(CRASHREPORTER_ENABLED_BY_DEFAULT ON)
+endif()
+option(WITH_CRASHREPORTER "Build with CrashReporter" ${CRASHREPORTER_ENABLED_BY_DEFAULT})
 option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
-option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-option(WITH_UPOWER "Build with support for UPower events" OFF)
-option(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" OFF)

-IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
-    message(STATUS "Build of breakpad library disabled on this platform.")
-    SET(WITH_BREAKPAD OFF)
+# build options for development purposes
+option(SANITIZE_ADDRESS "Enable Address Sanitizer for memory error detection" OFF)
+option(TOMAHAWK_FINEGRAINED_MESSAGES "Enable even more verbose logging (will hurt performance significantly" OFF)
+
+CMAKE_DEPENDENT_OPTION(WITH_UPOWER "Build with support for UPower events" ON
+       "UNIX;NOT APPLE" OFF)
+CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON
+       "UNIX;NOT APPLE" OFF)
+
+IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt")
+    message(STATUS "Build of crashreporter disabled.")
    SET(WITH_CRASHREPORTER OFF)
 ENDIF()

-# add definitions based on build options
-IF( WITH_BREAKPAD )
-    message(STATUS "Build with support for breakpad.")
-    IF( CMAKE_COMPILER_IS_GNUCXX )
-        ADD_DEFINITIONS( -DSTDC_HEADERS -std=gnu++98 )
-#        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTDC_HEADERS -std=gnu++98" )
-    ENDIF()
-ENDIF()
-
 # generate version string

 # base string used in release and unstable builds
-SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
-SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}" )
+SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH}")
+SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION_TMP}" )
 IF( TOMAHAWK_VERSION_RC )
-  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
+  SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_TMP}rc${TOMAHAWK_VERSION_RC}")
 ENDIF()

-
 # additional info for non-release builds
 IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
    INCLUDE( CMakeDateStamp )
    SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
    IF( TOMAHAWK_VERSION_DATE GREATER 0 )
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
+        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}.${TOMAHAWK_VERSION_DATE} )
    ENDIF()

    INCLUDE( CMakeVersionSource )
    IF( CMAKE_VERSION_SOURCE )
-        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
+        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}-${CMAKE_VERSION_SOURCE} )
    ENDIF()
 ENDIF()

+# write Tomahawk version to cache
+SET(TOMAHAWK_VERSION "${TOMAHAWK_VERSION_TMP}" CACHE STRING "Tomahawk Version")
+

 # set paths
-SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
+SET( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
@@ -102,145 +164,82 @@ INCLUDE( TomahawkCPack.cmake )
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )

-# headless mode
-if( NOT BUILD_GUI )
-    add_definitions( -DENABLE_HEADLESS )
-    message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
+message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Concurrent REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Sql REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5UiTools REQUIRED)
+find_package(Qt5WebKitWidgets REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Xml REQUIRED)
+find_package(Qt5X11Extras NO_MODULE QUIET)
+
+if(Qt5X11Extras_FOUND)
+    set(HAVE_X11 TRUE)
 else()
-    message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
+    set(HAVE_X11 FALSE)
 endif()

-
-if( NOT BUILD_WITH_QT4 )
-    find_package(Qt5Core QUIET)
-    if( Qt5Core_DIR )
-        find_package(Qt5Widgets QUIET)
-        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
-
-        macro(qt_wrap_ui)
-            qt5_wrap_ui(${ARGN})
-        endmacro()
-
-        macro(qt_add_resources)
-            qt5_add_resources(${ARGN})
-        endmacro()
-
-        find_package(Qt5LinguistTools REQUIRED)
-        macro(qt_add_translation)
-            qt5_add_translation(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_interface)
-            qt5_add_dbus_interface(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_adaptor)
-            qt5_add_dbus_adaptor(${ARGN})
-        endmacro()
-
-        macro(setup_qt)
-        endmacro()
-
-        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-        #FIXME: CrashReporter depends on deprecated QHttp
-        set(WITH_CRASHREPORTER OFF)
-        set(WITH_BREAKPAD OFF)
-    endif()
-endif()
-if( NOT Qt5Core_DIR )
-    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-    if( BUILD_GUI )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
-    endif()
-    if( BUILD_TESTS )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
-    endif()
-
-    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
-
-    macro(qt5_use_modules)
-    endmacro()
-
-    macro(qt_wrap_ui)
-        qt4_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt4_add_resources(${ARGN})
-    endmacro()
-
-    macro(qt_add_translation)
-        qt4_add_translation(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_interface)
-      qt4_add_dbus_interface(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_adaptor)
-        qt4_add_dbus_adaptor(${ARGN})
-    endmacro()
-
-    macro(setup_qt)
-        if( NOT BUILD_GUI )
-            set(QT_DONT_USE_QTGUI TRUE)
-        endif()
-        if( UNIX AND NOT APPLE )
-            set(QT_USE_QTDBUS TRUE)
-        endif()
-        set(QT_USE_QTSQL TRUE)
-        set(QT_USE_QTNETWORK TRUE)
-        set(QT_USE_QTXML TRUE)
-        set(QT_USE_QTWEBKIT TRUE)
-
-        include( ${QT_USE_FILE} )
-    endmacro()
+if( UNIX AND NOT APPLE )
+    # We need this to find the paths to qdbusxml2cpp and co
+    find_package(Qt5DBus REQUIRED)
 endif()

-if( BUILD_GUI AND UNIX AND NOT APPLE )
-    find_package( X11 )
+if(APPLE)
+    find_package(Qt5MacExtras REQUIRED)
 endif()

-IF( UNIX AND NOT APPLE AND QT_QTDBUS_FOUND )
-    SET( WITH_UPOWER ON )
-    SET( WITH_GNOMESHORTCUTHANDLER ON )
-ENDIF( UNIX AND NOT APPLE AND QT_QTDBUS_FOUND  )
-
-
-macro_optional_find_package(Phonon 4.5.0)
-macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
-if( PHONON_FOUND )
-    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+if(WIN32)
+    find_package(Qt5WinExtras REQUIRED)
 endif()

-macro_optional_find_package(Echonest 2.1.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.1.0 is needed for dynamic playlists and the infosystem")
+find_package(Qt5LinguistTools REQUIRED)

-macro_optional_find_package(CLucene 0.9.23)
-macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
+set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
+# FIXME: CrashReporter depends on deprecated QHttp

-macro_optional_find_package(QJSON)
-macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)

-macro_optional_find_package(Taglib 1.6.0)
-macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
-include( CheckTagLibFileName )
-check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
-
-find_package(Boost REQUIRED)
+find_package(Boost REQUIRED COMPONENTS filesystem system)
 macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation

-macro_optional_find_package(QCA2)
+macro_optional_find_package(Lucene++ 3.0.0)
+macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
+
+find_package(Taglib 1.8.0 REQUIRED)
+
+macro_optional_find_package(Sparsehash)
+macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
+    "An extremely memory-efficient hash_map implementation."
+    "https://code.google.com/p/sparsehash/" TRUE ""
+    "Sparsehash is needed for reading metadata of mediastreams and fast
+    forward/backward seeking in HTTP streams")
+
+macro_optional_find_package(GnuTLS)
+macro_log_feature(GNUTLS_FOUND "GnuTLS"
+    "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them."
+    "http://gnutls.org/" TRUE ""
+    "GnuTLS is needed for serving the Playdar/HTTP API via TLS")
+
+macro_optional_find_package(Qca-qt5)
+if(Qca-qt5_DIR)
+    set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
+    set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
+endif()
 macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")

-macro_optional_find_package(LibAttica 0.4.0)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
+macro_optional_find_package(KF5Attica 1.0.0)
+set(LIBATTICA_FOUND ${KF5Attica_FOUND})
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "http://download.kde.org/stable/attica/" TRUE "" "")

 macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
+macro_log_feature(QUAZIP_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")

 macro_optional_find_package(Jreen 1.0.5)
 macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
@@ -248,14 +247,18 @@ if( PC_JREEN_VERSION STREQUAL "1.1.0" )
    message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
 endif()

-macro_optional_find_package(QTweetLib)
-macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
-
 macro_optional_find_package(LibLastFm 1.0.0)
 macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")

-macro_optional_find_package(QtKeychain 0.1.0)
-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
+if( NOT APPLE )
+macro_optional_find_package(Qt5Keychain 0.1.0)
+macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
+endif()
+
+if( UNIX AND NOT APPLE )
+    macro_optional_find_package(TelepathyQt 0.9.3)
+    macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
+endif()

 # we need pthreads too
 macro_optional_find_package(Threads)
@@ -267,7 +270,14 @@ if( WIN32 )
    macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
 endif( WIN32 )

-#TODO: support external qxt
+if( WIN32 OR APPLE )
+    macro_optional_find_package(LibsnoreQt5 0.6.0 QUIET)
+    macro_log_feature(LibsnoreQt5_FOUND "Libsnore" "Library for notifications" "https://projects.kde.org/projects/playground/libs/snorenotify" FALSE "" "")
+endif()
+
+find_package(LIBVLC REQUIRED 2.1.0)
+macro_log_feature(LIBVLC_FOUND "LibVLC" "Provides audio output" "https://www.videolan.org/vlc/"  TRUE "" "")
+
 set(QXTWEB_FOUND TRUE)
 set(QXTWEB_LIBRARIES qxtweb-standalone)
 set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR})
@@ -292,23 +302,7 @@ add_subdirectory(${THIRDPARTY_DIR}/libportfwd)

 #### submodules end

-macro_optional_find_package(KDE4)
-macro_optional_find_package(KDE4Installed)
-
-# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
-# for future kde integration
-
-# macro_optional_find_package(KDE4)
-IF( KDE4_FOUND )
-    IF( CMAKE_C_FLAGS )
-        # KDE4 adds and removes some compiler flags that we don't like
-        # (only for gcc not for clang e.g.)
-        STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
-    ENDIF()
-ELSE()
-    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-ENDIF()
+SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )

 #show dep log
 macro_display_feature_log()
@@ -321,33 +315,44 @@ CONFIGURE_FILE(
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)

-# KDE4 defines an uninstall target for us automatically
-IF( NOT KDE4_FOUND )
-    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+IF( ( NOT APPLE ) AND ( NOT SANITIZE_ADDRESS ))
+    # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
+    #
+    # On using Address Sanitizer, we cannot link to the ASAN lib, so
+    # --no-undefined would break the build.
+    SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+    SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined" )
 ENDIF()

-IF( NOT APPLE )
-    # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-ENDIF( NOT APPLE )
+IF ( SANITIZE_ADDRESS )
+    SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
+ENDIF()

-SET( TOMAHAWK_LIBRARIES tomahawklib )
-SET( TOMAHAWK_WIDGETS_LIBRARIES tomahawk-widgets )
+# Early configure these files as we need them later on
+configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @ONLY)
+file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
+file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
+
+SET( TOMAHAWK_LIBRARY ${TOMAHAWK_BASE_TARGET_NAME}lib )
+SET( TOMAHAWK_LIBRARIES ${TOMAHAWK_LIBRARY} )
+SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-widgets )
+SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-playdarapi )

 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )

-if( BUILD_TESTS )
-    enable_testing()
-    add_subdirectory( tests )
-endif()
-
+IF(BUILD_TESTS)
+  find_package(Qt5Test REQUIRED)
+  enable_testing()
+  ADD_SUBDIRECTORY( src/tests )
+ENDIF()

 # Add all targets to the build-tree export set
 set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH  "Installation directory for CMake files")
 set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
-export(TARGETS tomahawklib
+export(TARGETS ${TOMAHAWK_LIBRARY}
  FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")

 # Export the package for use from the build-tree
@@ -363,10 +368,6 @@ file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAK
 configure_file(TomahawkConfig.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake" @ONLY)
 configure_file(TomahawkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake" @ONLY)

-file(COPY TomahawkUse.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-
 # Install the cmake files
 install(
    FILES
--- a/CMakeModules/AddAppIconMacro.cmake
+++ b/CMakeModules/AddAppIconMacro.cmake
@@ -1,114 +0,0 @@
-SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
-
-# This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
-#
-# Copyright (c) 2006-2009 Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2006, 2007, Laurent Montel, <montel@kde.org>
-# Copyright (c) 2007 Matthias Kretz <kretz@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file [in KDE repositories].
-
-
-# adds application icon to target source list 
-# for detailed documentation see the top of FindKDE4Internal.cmake
-macro (KDE4_ADD_APP_ICON appsources pattern)
-    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
-
-    if (WIN32)
-        if(NOT WINCE)
-        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
-        else(NOT WINCE)
-        find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH )
-        endif(NOT WINCE)
-        find_program(WINDRES_EXECUTABLE NAMES windres)
-        if(MSVC)
-            set(WINDRES_EXECUTABLE TRUE)
-        endif(MSVC)
-        if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            string(REPLACE "*" "(.*)" pattern_rx "${pattern}")
-            file(GLOB files  "${pattern}")
-            foreach (it ${files})
-                string(REGEX REPLACE "${pattern_rx}" "\\1" fn "${it}")
-                if (fn MATCHES ".*16.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*16.*")
-                if (fn MATCHES ".*32.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*32.*")
-                if (fn MATCHES ".*48.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*48.*")
-                if (fn MATCHES ".*64.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*64.*")
-                if (fn MATCHES ".*128.*" )
-                    list (APPEND _icons ${it})
-                endif (fn MATCHES ".*128.*")
-            endforeach (it)
-            if (_icons)
-                add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
-                                   COMMAND ${PNG2ICO_EXECUTABLE} ARGS --rcfile ${_outfilename}.rc ${_outfilename}.ico ${_icons}
-                                   DEPENDS ${PNG2ICO_EXECUTABLE} ${_icons}
-                                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                  )
-                if (MINGW)
-                    add_custom_command(OUTPUT ${_outfilename}_res.o
-                                       COMMAND ${WINDRES_EXECUTABLE} ARGS -i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}
-                                       DEPENDS ${WINDRES_EXECUTABLE} ${_outfilename}.rc
-                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                                      )
-                    list(APPEND ${appsources} ${_outfilename}_res.o)
-                else(MINGW)
-                    list(APPEND ${appsources} ${_outfilename}.rc)
-                endif(MINGW)
-            else(_icons)
-                message(STATUS "Unable to find a related icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
-            endif(_icons)
-        else(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-            message(STATUS "Unable to find the png2ico or windres utilities - application will not have an application icon!")
-        endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
-    endif(WIN32)
-    if (Q_WS_MAC)
-        # first convert image to a tiff using the Mac OS X "sips" utility,
-        # then use tiff2icns to convert to an icon
-        find_program(SIPS_EXECUTABLE NAMES sips)
-        find_program(TIFF2ICNS_EXECUTABLE NAMES tiff2icns)
-        if (SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-            file(GLOB_RECURSE files  "${pattern}")
-            # we can only test for the 128-icon like that - we don't use patterns anymore
-            foreach (it ${files})
-                if (it MATCHES ".*128.*" )
-                    set (_icon ${it})
-                endif (it MATCHES ".*128.*")
-            endforeach (it)
-
-            if (_icon)
-                
-                # first, get the basename of our app icon
-                add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff
-                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
-                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
-                                   DEPENDS ${_icon}
-                                   )
-
-                # This will register the icon into the bundle
-                set(MACOSX_BUNDLE_ICON_FILE ${appsources}.icns)
-
-                # Append the icns file to the sources list so it will be a dependency to the
-                # main target
-                list(APPEND ${appsources} ${_outfilename}.icns)
-
-                # Install the icon into the Resources dir in the bundle
-                set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-
-            else(_icon)
-                # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?
-                message(STATUS "Unable to find an 128x128 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
-            endif(_icon)
-
-        else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-            message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
-        endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-    endif(Q_WS_MAC)
-endmacro (KDE4_ADD_APP_ICON)
--- a/CMakeModules/CheckTagLibFileName.cmake
+++ b/CMakeModules/CheckTagLibFileName.cmake
@@ -1,15 +0,0 @@
-# taglib changed filenames to be a char/wchar struct on some platforms, need to check for it
-macro (CHECK_TAGLIB_FILENAME TAGLIB_FILENAME_COMPLEX)
-	include (CheckCXXSourceCompiles)
-	set (CMAKE_REQUIRED_FLAGS ${TAGLIB_CFLAGS})
-	set (CMAKE_REQUIRED_INCLUDES ${TAGLIB_INCLUDES})
-	set (CMAKE_REQUIRED_LIBRARIES ${TAGLIB_LIBRARIES})
-	check_cxx_source_compiles(
-	"#include <tfile.h>
-	int main()
-	{
-		TagLib::FileName fileName1(\"char\");
-		TagLib::FileName fileName2(L\"wchar\");
-		return 0;
-	}" ${TAGLIB_FILENAME_COMPLEX})
-endmacro (CHECK_TAGLIB_FILENAME)
--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
@@ -1,132 +0,0 @@
-#
-# This module looks for clucene (http://clucene.sf.net) support
-# It will define the following values
-#
-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
-# CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
-# CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
-# CLUCENE_LIBRARIES    = the libraries to link against CLucene
-# CLUCENE_VERSION      = The CLucene version string
-# CLucene_FOUND        = set to 1 if clucene is found
-#
-
-INCLUDE(CheckSymbolExists)
-INCLUDE(FindLibraryWithDebug)
-
-# try to locate a patched unstable version (for comp's sake *sigh*) first
-FIND_PACKAGE(CLuceneUnstable QUIET)
-IF(CLUCENEUNSTABLE_FOUND)
-    SET(CLucene_FOUND TRUE)
-    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
-    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
-    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
-
-    #MESSAGE(FATAL_ERROR NARF)
-ELSE(CLUCENEUNSTABLE_FOUND)
-IF(CLucene_FIND_VERSION)
-  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
-ELSEIF()
-  SET(CLUCENE_MIN_VERSION "0.9.23")
-ENDIF(CLucene_FIND_VERSION)
-
-IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-  INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
-ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
-
-SET(TRIAL_LIBRARY_PATHS
-  $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
-  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-  /usr/local/lib${LIB_SUFFIX}
-  /usr/lib${LIB_SUFFIX}
-  /sw/lib${LIB_SUFFIX}
-  /usr/pkg/lib${LIB_SUFFIX}
-  /usr/lib64
-  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  )
-SET(TRIAL_INCLUDE_PATHS
-  $ENV{CLUCENE_HOME}/include
-  ${CMAKE_INSTALL_PREFIX}/include
-  /usr/local/include
-  /usr/include
-  /sw/include
-  /usr/pkg/include
-  )
-FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES clucene-core
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (CLUCENE_CORE_LIBRARY)
-  MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
-ENDIF (CLUCENE_CORE_LIBRARY)
-FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES clucene-shared
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (CLUCENE_SHARED_LIBRARY)
-  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
-ENDIF (CLUCENE_SHARED_LIBRARY)
-
-IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
-  SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
-ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
-
-FIND_PATH(CLUCENE_INCLUDE_DIR
-  NAMES CLucene.h
-  PATHS ${TRIAL_INCLUDE_PATHS})
-
-IF (CLUCENE_INCLUDE_DIR)
-  MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
-ENDIF (CLUCENE_INCLUDE_DIR)
-
-IF(WIN32)
-  SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
-ENDIF(WIN32)
-
-SET(CLUCENE_GOOD_VERSION TRUE)
-
-FIND_PATH(CLUCENE_LIBRARY_DIR
-	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
-       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-IF (CLUCENE_LIBRARY_DIR)
-  MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
-  # include CLuceneConfig/CLuceneConfig.cmake
-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
-  # include CLucene/CLuceneConfig.cmake
-  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
-  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
-    SET(CLUCENE_GOOD_VERSION FALSE)
-  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
-  IF (CLUCENE_VERSION STREQUAL "0.9.17")
-    MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
-    SET(CLUCENE_GOOD_VERSION FALSE)
-  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
-ENDIF (CLUCENE_LIBRARY_DIR)
-
-IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-  SET(CLucene_FOUND TRUE)
-  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
-ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
-
-ENDIF(CLUCENEUNSTABLE_FOUND)
-
-IF(CLucene_FOUND)
-  IF(NOT CLucene_FIND_QUIETLY)
-    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
-  ENDIF(NOT CLucene_FIND_QUIETLY)
-ELSE(CLucene_FOUND)
-  IF(CLucene_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find CLucene.")
-  ENDIF(CLucene_FIND_REQUIRED)
-ENDIF(CLucene_FOUND)
-
-MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIRS
-  CLUCENE_INCLUDE_DIR
-  CLUCENE_LIBRARY_DIR
-  CLUCENE_LIBRARIES
-  )
--- a/CMakeModules/FindCLuceneUnstable.cmake
+++ b/CMakeModules/FindCLuceneUnstable.cmake
@@ -1,37 +0,0 @@
-# - Try to find clucene-unstable
-#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
-#
-#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
-#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
-#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
-
-# Include dir
-find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
-  NAMES CLucene.h
-  PATH_SUFFIXES clucene-unstable
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-# Finally the library itself
-find_library(CLUCENE_UNSTABLE_SHARED_LIB
-  NAMES clucene-unstable-shared
-  PATHS ${KDE4_LIB_DIR}
-)
-
-find_library(CLUCENE_UNSTABLE_CORE_LIB
-  NAMES clucene-unstable-core
-  PATHS ${KDE4_LIB_DIR}
-)
-
-
-SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
-SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-
-
-MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
-
--- a/CMakeModules/FindEchonest.cmake
+++ b/CMakeModules/FindEchonest.cmake
@@ -1,36 +0,0 @@
-# - Find libechonest
-# Find the libechonest includes and the libechonest libraries
-# This module defines
-# ECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h
-# ECHONEST_LIBRARIES, the path to libechonest
-# ECHONEST_FOUND, whether libechonest was found
-
-FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest)
-
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
-    HINTS
-        ${PC_ECHONEST_INCLUDEDIR}
-        ${PC_ECHONEST_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest
-    HINTS
-        ${PC_ECHONEST_LIBDIR}
-        ${PC_ECHONEST_LIBRARY_DIRS}
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
-)
-
-IF(ECHONEST_LIBRARIES AND ECHONEST_INCLUDE_DIR AND NOT PC_ECHONEST_VERSION)
-    MESSAGE(WARNING "You don't have pkg-config and so the libechonest version check does not work!")
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Echonest
-                                  REQUIRED_VARS ECHONEST_LIBRARIES ECHONEST_INCLUDE_DIR
-                                  VERSION_VAR PC_ECHONEST_VERSION)
-
-MARK_AS_ADVANCED(ECHONEST_INCLUDE_DIR ECHONEST_LIBRARIES)
--- a/CMakeModules/FindJreen.cmake
+++ b/CMakeModules/FindJreen.cmake
@@ -6,22 +6,22 @@
 # LIBJREEN_FOUND, whether libjreen was found

 FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
+PKG_CHECK_MODULES(PC_JREEN QUIET libjreen-qt5)

 FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
    HINTS
        ${PC_JREEN_INCLUDEDIR}
        ${PC_JREEN_INCLUDE_DIRS}
        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
+    PATH_SUFFIXES
+        jreen-qt5
 )

-FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen-qt5
    HINTS
        ${PC_JREEN_LIBDIR}
        ${PC_JREEN_LIBRARY_DIRS}
        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
 )

 IF(JREEN_LIBRARIES AND JREEN_INCLUDE_DIR AND NOT PC_JREEN_VERSION)
--- a/CMakeModules/FindKDE4Installed.cmake
+++ b/CMakeModules/FindKDE4Installed.cmake
@@ -1,20 +0,0 @@
-# Simple hack to detect wether KDE4 is *installed* -- not anything about the development environment!
-
-FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
-
-# For KDE4 kde-config has been renamed to kde4-config
-FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
-   # the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
-   PATH_SUFFIXES bin               
-   HINTS
-   ${CMAKE_INSTALL_PREFIX}
-   ${_KDEDIRS}
-   /opt/kde4
-   ONLY_CMAKE_FIND_ROOT_PATH
-   )
-
-IF (KDE4_KDECONFIG_EXECUTABLE)
-   SET (KDE4_INSTALLED TRUE)
-   message(STATUS "KDE4 is installed, will install protocol file")
-ENDIF (KDE4_KDECONFIG_EXECUTABLE)
-
--- a/CMakeModules/FindLIBVLC.cmake
+++ b/CMakeModules/FindLIBVLC.cmake
@@ -0,0 +1,34 @@
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_LIBVLC QUIET libvlc)
+set(LIBVLC_DEFINITIONS ${PC_LIBVLC_CFLAGS_OTHER})
+
+find_path(LIBVLC_INCLUDE_DIR vlc/vlc.h
+    HINTS
+        ${PC_LIBVLC_INCLUDEDIR}
+        ${PC_LIBVLC_INCLUDE_DIRS}
+        /usr/local/opt/vlc/include
+)
+
+find_library(LIBVLC_LIBRARY NAMES vlc libvlc
+    HINTS
+        ${PC_LIBVLC_LIBDIR}
+        ${PC_LIBVLC_LIBRARY_DIRS}
+        /usr/local/opt/vlc/lib
+)
+
+
+set(LIBVLC_VERSION ${PC_LIBVLC_VERSION})
+
+include(CheckCXXSourceCompiles)
+check_cxx_source_compiles("
+#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+int main(int argc, char *argv[]) {
+    libvlc_meta_t meta = libvlc_meta_AlbumArtist;
+}"
+HAVE_VLC_ALBUMARTIST)
+
+find_package_handle_standard_args(LibVLC
+    REQUIRED_VARS LIBVLC_LIBRARY LIBVLC_INCLUDE_DIR
+    VERSION_VAR LIBVLC_VERSION
+)
--- a/CMakeModules/FindLibLastFm.cmake
+++ b/CMakeModules/FindLibLastFm.cmake
@@ -10,14 +10,12 @@
 # Include dir
 find_path(LIBLASTFM_INCLUDE_DIR
  # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
-  NAMES lastfm/Track.h
-  PATHS ${KDE4_INCLUDE_DIR}
+  NAMES lastfm5/Track.h
 )

 # Finally the library itself
 find_library(LIBLASTFM_LIBRARY
-  NAMES lastfm
-  PATHS ${KDE4_LIB_DIR}
+  NAMES lastfm5
 )

 set(LIBLASTFM_LIBRARIES ${LIBLASTFM_LIBRARY})
--- a/CMakeModules/FindLucene++.cmake
+++ b/CMakeModules/FindLucene++.cmake
@@ -0,0 +1,103 @@
+#
+# This module looks for lucene++ support
+# It will define the following values
+#
+# LUCENEPP_INCLUDE_DIRS = LUCENEPP_INCLUDE_DIR + LUCENEPP_LIBRARY_DIR
+# LUCENEPP_INCLUDE_DIR  = where lucene++/Lucene.h can be found
+# LUCENEPP_LIBRARY_DIR  = where liblucene++.so can be found
+# LUCENEPP_LIBRARIES    = the libraries to link against lucene++
+# LUCENEPP_VERSION      = The lucene++ version string
+# LUCENEPP_FOUND        = set to 1 if lucene++ is found
+#
+
+INCLUDE(CheckSymbolExists)
+INCLUDE(FindLibraryWithDebug)
+
+IF(LUCENEPP_FIND_VERSION)
+  SET(LUCENEPP_MIN_VERSION ${LUCENEPP_FIND_VERSION})
+ELSEIF()
+  SET(LUCENEPP_MIN_VERSION "3.0.0")
+ENDIF(LUCENEPP_FIND_VERSION)
+
+SET(TRIAL_LIBRARY_PATHS
+  $ENV{LUCENEPP_HOME}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib
+  /usr/local/lib${LIB_SUFFIX}
+  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  /usr/lib${LIB_SUFFIX}
+  /sw/lib${LIB_SUFFIX}
+  /usr/pkg/lib${LIB_SUFFIX}
+  /usr/lib64
+  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  )
+SET(TRIAL_INCLUDE_PATHS
+  $ENV{LUCENEPP_HOME}/include
+  ${CMAKE_INSTALL_PREFIX}/include
+  /usr/local/include
+  /usr/include
+  /sw/include
+  /usr/pkg/include
+  )
+FIND_LIBRARY_WITH_DEBUG(LUCENEPP_CORE_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES lucene++
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (LUCENEPP_CORE_LIBRARY)
+  MESSAGE(STATUS "Found Lucene++ core library: ${LUCENEPP_CORE_LIBRARY}")
+ENDIF (LUCENEPP_CORE_LIBRARY)
+FIND_LIBRARY_WITH_DEBUG(LUCENEPP_SHARED_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES lucene++-contrib
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (LUCENEPP_SHARED_LIBRARY)
+  MESSAGE(STATUS "Found Lucene++ contrib library: ${LUCENEPP_SHARED_LIBRARY}")
+ENDIF (LUCENEPP_SHARED_LIBRARY)
+
+IF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
+  SET(LUCENEPP_LIBRARIES ${LUCENEPP_CORE_LIBRARY} ${LUCENEPP_SHARED_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ENDIF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
+
+FIND_PATH(LUCENEPP_INCLUDE_DIR
+  NAMES lucene++/Lucene.h
+  PATHS ${TRIAL_INCLUDE_PATHS})
+
+IF (LUCENEPP_INCLUDE_DIR)
+  MESSAGE(STATUS "Found Lucene++ include dir: ${LUCENEPP_INCLUDE_DIR}")
+ENDIF (LUCENEPP_INCLUDE_DIR)
+
+SET(LUCENEPP_GOOD_VERSION TRUE)
+
+FIND_PATH(LUCENEPP_LIBRARY_DIR
+	NAMES liblucene++.dylib liblucene++.so liblucene++.dll.a lucene++
+       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+IF (LUCENEPP_LIBRARY_DIR)
+  MESSAGE(STATUS "Found Lucene++ library dir: ${LUCENEPP_LIBRARY_DIR}")
+
+  IF (LUCENEPP_VERSION VERSION_LESS "${LUCENEPP_MIN_VERSION}")
+    MESSAGE(ERROR " Lucene++ version ${LUCENEPP_VERSION} is less than the required minimum ${LUCENEPP_MIN_VERSION}")
+    SET(LUCENEPP_GOOD_VERSION FALSE)
+  ENDIF (LUCENEPP_VERSION VERSION_LESS "${LUCENEPP_MIN_VERSION}")
+ENDIF (LUCENEPP_LIBRARY_DIR)
+
+IF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
+  SET(LUCENEPP_FOUND TRUE)
+  SET(LUCENEPP_INCLUDE_DIRS ${LUCENEPP_LIBRARY_DIR} ${LUCENEPP_INCLUDE_DIR})
+ENDIF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
+
+IF(LUCENEPP_FOUND)
+  IF(NOT LUCENEPP_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Lucene++: ${LUCENEPP_LIBRARIES} version ${LUCENEPP_VERSION}")
+  ENDIF(NOT LUCENEPP_FIND_QUIETLY)
+ELSE(LUCENEPP_FOUND)
+  IF(LUCENEPP_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Lucene++.")
+  ENDIF(LUCENEPP_FIND_REQUIRED)
+ENDIF(LUCENEPP_FOUND)
+
+MARK_AS_ADVANCED(
+  LUCENEPP_INCLUDE_DIRS
+  LUCENEPP_INCLUDE_DIR
+  LUCENEPP_LIBRARY_DIR
+  LUCENEPP_LIBRARIES
+  )
--- a/CMakeModules/FindOggVorbis.cmake
+++ b/CMakeModules/FindOggVorbis.cmake
@@ -1,89 +0,0 @@
-# - Try to find the OggVorbis libraries
-# Once done this will define
-#
-#  OGGVORBIS_FOUND - system has OggVorbis
-#  OGGVORBIS_VERSION - set either to 1 or 2
-#  OGGVORBIS_INCLUDE_DIR - the OggVorbis include directory
-#  OGGVORBIS_LIBRARIES - The libraries needed to use OggVorbis
-#  OGG_LIBRARY         - The Ogg library
-#  VORBIS_LIBRARY      - The Vorbis library
-#  VORBISFILE_LIBRARY  - The VorbisFile library
-#  VORBISENC_LIBRARY   - The VorbisEnc library
-
-# Copyright (c) 2006, Richard Laerkaeng, <richard@goteborg.utfors.se>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-include (CheckLibraryExists)
-
-find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
-find_path(OGG_INCLUDE_DIR ogg/ogg.h)
-
-find_library(OGG_LIBRARY NAMES ogg)
-find_library(VORBIS_LIBRARY NAMES vorbis)
-find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
-find_library(VORBISENC_LIBRARY NAMES vorbisenc)
-
-mark_as_advanced(VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR
-                 OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY VORBISENC_LIBRARY)
-
-
-if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
-   set(OGGVORBIS_FOUND TRUE)
-
-   set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
-
-   set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
-   set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES})
-   check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
-   set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP})
-
-   if (HAVE_LIBVORBISENC2)
-      set (OGGVORBIS_VERSION 2)
-   else (HAVE_LIBVORBISENC2)
-      set (OGGVORBIS_VERSION 1)
-   endif (HAVE_LIBVORBISENC2)
-
-else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
-   set (OGGVORBIS_VERSION)
-   set(OGGVORBIS_FOUND FALSE)
-endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
-
-
-if (OGGVORBIS_FOUND)
-   if (NOT OggVorbis_FIND_QUIETLY)
-      message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}")
-   endif (NOT OggVorbis_FIND_QUIETLY)
-else (OGGVORBIS_FOUND)
-   if (OggVorbis_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find OggVorbis libraries")
-   endif (OggVorbis_FIND_REQUIRED)
-   if (NOT OggVorbis_FIND_QUITELY)
-      message(STATUS "Could NOT find OggVorbis libraries")
-   endif (NOT OggVorbis_FIND_QUITELY)
-endif (OGGVORBIS_FOUND)
-
-#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H)
-#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG)
-#check_library_exists(vorbis vorbis_info_init "" HAVE_LIBVORBIS)
-#check_library_exists(vorbisfile ov_open "" HAVE_LIBVORBISFILE)
-#check_library_exists(vorbisenc vorbis_info_clear "" HAVE_LIBVORBISENC)
-#check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
-
-#if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
-#    message(STATUS "Ogg/Vorbis found")
-#    set (VORBIS_LIBS "-lvorbis -logg")
-#    set (VORBISFILE_LIBS "-lvorbisfile")
-#    set (VORBISENC_LIBS "-lvorbisenc")
-#    set (OGGVORBIS_FOUND TRUE)
-#    if (HAVE_LIBVORBISENC2)
-#        set (HAVE_VORBIS 2)
-#    else (HAVE_LIBVORBISENC2)
-#        set (HAVE_VORBIS 1)
-#    endif (HAVE_LIBVORBISENC2)
-#else (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
-#    message(STATUS "Ogg/Vorbis not found")
-#endif (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
-
--- a/CMakeModules/FindPhonon.cmake
+++ b/CMakeModules/FindPhonon.cmake
@@ -1,37 +0,0 @@
-# Find libphonon
-# Once done this will define
-#
-#  PHONON_FOUND    - system has Phonon Library
-#  PHONON_INCLUDES - the Phonon include directory
-#  PHONON_LIBS     - link these to use Phonon
-#  PHONON_VERSION  - the version of the Phonon Library
-
-# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro(_phonon_find_version)
-   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
-   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
-   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
-   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
-   set(PHONON_VERSION "${CMAKE_MATCH_1}")
-endmacro(_phonon_find_version)
-
-# the dirs listed with HINTS are searched before the default sets of dirs
-find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
-
-if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-   set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
-   set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
-   _phonon_find_version()
-endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)
-
-mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)
--- a/CMakeModules/FindQJSON.cmake
+++ b/CMakeModules/FindQJSON.cmake
@@ -1,29 +0,0 @@
-# Find QJSON - JSON handling library for Qt
-#
-# This module defines
-#  QJSON_FOUND - whether the qsjon library was found
-#  QJSON_LIBRARIES - the qjson library
-#  QJSON_INCLUDE_DIR - the include path of the qjson library
-#
-
-find_library (QJSON_LIBRARIES
-    NAMES
-    qjson
-    PATHS
-    ${QJSON_LIBRARY_DIRS}
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-)
-
-find_path (QJSON_INCLUDE_DIR
-    NAMES
-    qjson/parser.h
-    PATHS
-    ${QJSON_INCLUDE_DIRS}
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
-
--- a/CMakeModules/FindQTweetLib.cmake
+++ b/CMakeModules/FindQTweetLib.cmake
@@ -1,28 +0,0 @@
-# - Try to find QTweetLib
-#
-#  QTWEETLIB_FOUND - system has QTweetLib
-#  QTWEETLIB_INCLUDE_DIRS - the QTweetLib include directories
-#  QTWEETLIB_LIBRARIES - link these to use QTweetLib
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
-
-# Include dir
-find_path(QTWEETLIB_INCLUDE_DIR
-  NAMES QTweetLib/qtweetlib_global.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-# Finally the library itself
-find_library(QTWEETLIB_LIBRARY
-  NAMES QTweetLib
-  PATHS ${KDE4_LIB_DIR}
-)
-
-SET( QTWEETLIB_LIBRARIES  ${QTWEETLIB_LIBRARY} ${QJSON_LIBRARIES} )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QTweetLib DEFAULT_MSG QTWEETLIB_LIBRARY QTWEETLIB_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(QTWEETLIB_LIBRARIES QTWEETLIB_INCLUDE_DIR)
-
--- a/CMakeModules/FindQtSparkle.cmake
+++ b/CMakeModules/FindQtSparkle.cmake
@@ -5,16 +5,12 @@
 # QTSPARKLE_LIBRARY, the path to qtsparkle
 # QTSPARKLE_FOUND, whether qtsparkle was found

-FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle/Updater
-    HINTS
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
+FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle-qt5/Updater
+    HINTS ${CMAKE_INSTALL_INCLUDEDIR}
 )

-FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle
-    HINTS
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
+FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle-qt5
+    HINTS ${CMAKE_INSTALL_LIBDIR}
 )

 INCLUDE(FindPackageHandleStandardArgs)
--- a/CMakeModules/FindQuaZip.cmake
+++ b/CMakeModules/FindQuaZip.cmake
@@ -1,10 +1,40 @@
-find_path(QuaZip_INCLUDE_DIR quazip/quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
-find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
-mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-
-if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
-   set(QuaZip_FOUND TRUE)
-endif()
+# QUAZIP_FOUND               - QuaZip library was found
+# QUAZIP_INCLUDE_DIR         - Path to QuaZip include dir
+# QUAZIP_INCLUDE_DIRS        - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
+# QUAZIP_LIBRARIES           - List of QuaZip libraries
+# QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
+
+
+IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+	# in cache already
+	SET(QUAZIP_FOUND TRUE)
+ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+	IF (WIN32)
+		FIND_PATH(QUAZIP_LIBRARY_DIR
+			WIN32_DEBUG_POSTFIX d
+            NAMES libquazip5.dll
+			HINTS "C:/Programme/" "C:/Program Files"
+			PATH_SUFFIXES QuaZip/lib
+		)
+        FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip5.dll HINTS ${QUAZIP_LIBRARY_DIR})
+		FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip5)
+		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
+	ELSE(WIN32)
+		FIND_PACKAGE(PkgConfig)
+#     pkg_check_modules(PC_QCA2 QUIET qca2)
+		pkg_check_modules(PC_QUAZIP quazip)
+		FIND_LIBRARY(QUAZIP_LIBRARIES
+			WIN32_DEBUG_POSTFIX d
+            NAMES quazip5
+			HINTS /usr/lib /usr/lib64
+		)
+		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+			HINTS /usr/include /usr/local/include
+			PATH_SUFFIXES quazip5
+		)
+		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+	ENDIF (WIN32)
+	INCLUDE(FindPackageHandleStandardArgs)
+	SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
+	find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
+ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
--- a/CMakeModules/FindSparsehash.cmake
+++ b/CMakeModules/FindSparsehash.cmake
@@ -0,0 +1,25 @@
+# - Find google-sparsehash
+# Find the google-sparsehash includes
+# This module defines
+# SPARSEHASH_INCLUDE_DIR, root jreen include dir.
+# SPARSEHASH_FOUND, whether libjreen was found
+
+FIND_PACKAGE(PkgConfig QUIET)
+PKG_CHECK_MODULES(PC_SPARSEHASH QUIET libsparsehash)
+
+FIND_PATH(SPARSEHASH_INCLUDE_DIR NAMES google/sparsetable
+    HINTS
+        ${PC_SPARSEHASH_INCLUDEDIR}
+        ${PC_SPARSEHASH_INCLUDE_DIRS}
+        ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+IF(SPARSEHASH_INCLUDE_DIR AND NOT PC_SPARSEHASH_VERSION)
+    MESSAGE(WARNING "You don't have pkg-config and so the google-sparsehash version check does not work!")
+ENDIF()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sparsehash
+    REQUIRED_VARS SPARSEHASH_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(SPARSEHASH_INCLUDE_DIR)
--- a/CMakeModules/FindTaglib.cmake
+++ b/CMakeModules/FindTaglib.cmake
@@ -1,89 +1,90 @@
-# - Try to find the Taglib library
-# Once done this will define
+#.rst:
+# FindTaglib
+# ----------
 #
-#  TAGLIB_FOUND - system has the taglib library
-#  TAGLIB_CFLAGS - the taglib cflags
-#  TAGLIB_LIBRARIES - The libraries needed to use taglib
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+# Try to find the Taglib library.
 #
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# This will define the following variables:
+#
+# ``Taglib_FOUND``
+#       True if the system has the taglib library of at least the minimum
+#       version specified by the version parameter to find_package()
+# ``Taglib_INCLUDE_DIRS``
+#       The taglib include dirs for use with target_include_directories
+# ``Taglib_LIBRARIES``
+#       The taglib libraries for use with target_link_libraries()
+# ``Taglib_VERSION``
+#       The version of taglib that was found
+#
+# If ``Taglib_FOUND`` is TRUE, it will also define the following imported
+# target:
+#
+# ``Taglib::Taglib``
+#       The Taglib library
+#
+# Since 5.72.0
+#
+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org>
+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org>
+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org>
+# SPDX-License-Identifier: BSD-3-Clause

-IF(TAGLIB_FOUND)
-	MESSAGE(STATUS "Using manually specified taglib locations")
-ELSE()
+find_package(PkgConfig QUIET)

-	if(NOT TAGLIB_MIN_VERSION)
-	  set(TAGLIB_MIN_VERSION "1.6")
-	endif(NOT TAGLIB_MIN_VERSION)
+pkg_search_module(PC_TAGLIB QUIET taglib)

-	if(NOT WIN32)
-		find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS
-		   ${BIN_INSTALL_DIR}
-		)
-	endif(NOT WIN32)
+find_path(Taglib_INCLUDE_DIRS
+    NAMES tag.h
+    PATH_SUFFIXES taglib
+    HINTS ${PC_TAGLIB_INCLUDEDIR}
+)

-	#reset vars
-	set(TAGLIB_LIBRARIES)
-	set(TAGLIB_CFLAGS)
+find_library(Taglib_LIBRARIES
+    NAMES tag
+    HINTS ${PC_TAGLIB_LIBDIR}
+)

-#	MESSAGE( STATUS "PATHS: ${PATHS}")
-	# if taglib-config has been found
-	if(TAGLIBCONFIG_EXECUTABLE)
+set(Taglib_VERSION ${PC_TAGLIB_VERSION})

-	  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION)
+    if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h")
+        file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H)

-	  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-		 message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-		 set(TAGLIB_FOUND FALSE)
-	  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
+        string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H})
+        string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H})
+        string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H})

-		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+        string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}")
+        string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}")
+        string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}")

-		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS)
+        set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}")
+    endif()
+endif()

-		 if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-			set(TAGLIB_FOUND TRUE)
-#			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
-		 endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-		 string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-	  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-	  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Taglib
+    FOUND_VAR
+        Taglib_FOUND
+    REQUIRED_VARS
+        Taglib_LIBRARIES
+        Taglib_INCLUDE_DIRS
+    VERSION_VAR
+        Taglib_VERSION
+)

-	else(TAGLIBCONFIG_EXECUTABLE)
+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib)
+    add_library(Taglib::Taglib UNKNOWN IMPORTED)
+    set_target_properties(Taglib::Taglib PROPERTIES
+        IMPORTED_LOCATION "${Taglib_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}"
+    )
+endif()

-	  include(FindLibraryWithDebug)
-	  include(FindPackageHandleStandardArgs)
+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS)

-	  find_path(TAGLIB_INCLUDES
-		NAMES
-		tag.h
-		PATH_SUFFIXES taglib
-		PATHS
-		${KDE4_INCLUDE_DIR}
-		${INCLUDE_INSTALL_DIR}
-	  )
-
-	  find_library_with_debug(TAGLIB_LIBRARIES
-		WIN32_DEBUG_POSTFIX d
-		NAMES tag
-		PATHS
-		${KDE4_LIB_DIR}
-		${LIB_INSTALL_DIR}
-	  )
-	  
-	  find_package_handle_standard_args(Taglib DEFAULT_MSG 
-										TAGLIB_INCLUDES TAGLIB_LIBRARIES)
-	endif(TAGLIBCONFIG_EXECUTABLE)
-ENDIF()
-
-if(TAGLIB_FOUND)
-  if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
-    message(STATUS "Found TagLib: ${TAGLIB_LIBRARIES}")
-  endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE)
-else(TAGLIB_FOUND)
-  if(Taglib_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find Taglib")
-  endif(Taglib_FIND_REQUIRED)
-endif(TAGLIB_FOUND)
+include(FeatureSummary)
+set_package_properties(Taglib PROPERTIES
+    URL "https://taglib.org/"
+    DESCRIPTION "A library for reading and editing the meta-data of audio formats"
+)
--- a/CMakeModules/FindTelepathyQt.cmake
+++ b/CMakeModules/FindTelepathyQt.cmake
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Teo Mrnjavac <teo@kde.org>
+
+include(FindPackageHandleStandardArgs)
+
+find_package(TelepathyQt5 NO_MODULE)
+set(TelepathyQt_FOUND ${TelepathyQt5_FOUND})
+set(TELEPATHY_QT_VERSION ${TELEPATHY_QT5_VERSION})
+set(TELEPATHY_QT_INSTALL_DIR ${TELEPATHY_QT5_INSTALL_DIR})
+set(TELEPATHY_QT_INCLUDE_DIR ${TELEPATHY_QT5_INCLUDE_DIR})
+set(TELEPATHY_QT_LIB_DIR ${TELEPATHY_QT5_LIB_DIR})
+set(TELEPATHY_QT_SHARE_DIR ${TELEPATHY_QT5_SHARE_DIR})
+set(TELEPATHY_QT_LIBRARIES ${TELEPATHY_QT5_LIBRARIES})
+
+set(TELEPATHY_QT_FOUND ${TelepathyQt_FOUND})
+
+find_package_handle_standard_args(TelepathyQt DEFAULT_MSG  TELEPATHY_QT_INSTALL_DIR )
--- a/CMakeModules/GNUInstallDirs.cmake
+++ b/CMakeModules/GNUInstallDirs.cmake
@@ -1,182 +0,0 @@
-# - Define GNU standard installation directories
-# Provides install directory variables as defined for GNU software:
-#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-# Inclusion of this module defines the following variables:
-#  CMAKE_INSTALL_<dir>      - destination for files of a given type
-#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
-# where <dir> is one of:
-#  BINDIR           - user executables (bin)
-#  SBINDIR          - system admin executables (sbin)
-#  LIBEXECDIR       - program executables (libexec)
-#  SYSCONFDIR       - read-only single-machine data (etc)
-#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
-#  LOCALSTATEDIR    - modifiable single-machine data (var)
-#  LIBDIR           - object code libraries (lib or lib64)
-#  INCLUDEDIR       - C header files (include)
-#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
-#  DATAROOTDIR      - read-only architecture-independent data root (share)
-#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
-#  INFODIR          - info documentation (DATAROOTDIR/info)
-#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
-#  MANDIR           - man documentation (DATAROOTDIR/man)
-#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
-# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
-# install() commands for the corresponding file type.  If the includer does
-# not define a value the above-shown default will be used and the value will
-# appear in the cache for editing by the user.
-# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
-# from the corresponding destination by prepending (if necessary) the value
-# of CMAKE_INSTALL_PREFIX.
-
-#=============================================================================
-# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
-# Copyright 2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# Installation directories
-#
-if(NOT DEFINED CMAKE_INSTALL_BINDIR)
-  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
-  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
-  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
-  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
-  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
-  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-  set(_LIBDIR_DEFAULT "lib")
-  # Override this default 'lib' with 'lib64' iff:
-  #  - we are on Linux system but NOT cross-compiling
-  #  - we are NOT on debian
-  #  - we are on a 64 bits system
-  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
-  # Note that the future of multi-arch handling may be even
-  # more complicated than that: http://wiki.debian.org/Multiarch
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-      AND NOT CMAKE_CROSSCOMPILING
-      AND NOT EXISTS "/etc/debian_version")
-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
-      message(AUTHOR_WARNING
-        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
-        "Please enable at least one language before including GNUInstallDirs.")
-    else()
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        set(_LIBDIR_DEFAULT "lib64")
-      endif()
-    endif()
-  endif()
-  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
-  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
-  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
-endif()
-
-if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
-  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
-endif()
-
-#-----------------------------------------------------------------------------
-# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
-# the cache and store the defaults in local variables if the cache values are
-# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
-
-if(NOT CMAKE_INSTALL_DATADIR)
-  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
-  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
-endif()
-
-if(NOT CMAKE_INSTALL_INFODIR)
-  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
-  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
-endif()
-
-if(NOT CMAKE_INSTALL_LOCALEDIR)
-  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
-  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-endif()
-
-if(NOT CMAKE_INSTALL_MANDIR)
-  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
-  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
-endif()
-
-if(NOT CMAKE_INSTALL_DOCDIR)
-  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
-  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
-endif()
-
-#-----------------------------------------------------------------------------
-
-mark_as_advanced(
-  CMAKE_INSTALL_BINDIR
-  CMAKE_INSTALL_SBINDIR
-  CMAKE_INSTALL_LIBEXECDIR
-  CMAKE_INSTALL_SYSCONFDIR
-  CMAKE_INSTALL_SHAREDSTATEDIR
-  CMAKE_INSTALL_LOCALSTATEDIR
-  CMAKE_INSTALL_LIBDIR
-  CMAKE_INSTALL_INCLUDEDIR
-  CMAKE_INSTALL_OLDINCLUDEDIR
-  CMAKE_INSTALL_DATAROOTDIR
-  CMAKE_INSTALL_DATADIR
-  CMAKE_INSTALL_INFODIR
-  CMAKE_INSTALL_LOCALEDIR
-  CMAKE_INSTALL_MANDIR
-  CMAKE_INSTALL_DOCDIR
-  )
-
-# Result directories
-#
-foreach(dir
-    BINDIR
-    SBINDIR
-    LIBEXECDIR
-    SYSCONFDIR
-    SHAREDSTATEDIR
-    LOCALSTATEDIR
-    LIBDIR
-    INCLUDEDIR
-    OLDINCLUDEDIR
-    DATAROOTDIR
-    DATADIR
-    INFODIR
-    LOCALEDIR
-    MANDIR
-    DOCDIR
-    )
-  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
-  else()
-    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
-  endif()
-endforeach()
--- a/CMakeModules/MacroLogFeature.cmake
+++ b/CMakeModules/MacroLogFeature.cmake
@@ -93,7 +93,7 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _
   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")

   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
-     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
+     SET_PACKAGE_PROPERTIES("${_package}" PROPERTIES DESCRIPTION "\"${_description}\"" URL "${_url}" PURPOSE "\"${_comments}\"")
   ENDIF(COMMAND SET_PACKAGE_INFO)

 ENDMACRO(MACRO_LOG_FEATURE)
--- a/CMakeModules/NSIS.template.in
+++ b/CMakeModules/NSIS.template.in
@@ -15,16 +15,24 @@
 ;-----------------------------------------------------------------------------
 ; Some paths.
 ;-----------------------------------------------------------------------------
-!ifndef MING_PATH
-    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
+!ifndef MINGW_ROOT
+    !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw"
 !endif
-!define MING_BIN "${MING_PATH}/bin"
-!define MING_LIB "${MING_PATH}/lib"
+!define APPLICATION_NAME "@CPACK_PACKAGE_NAME@"
+!define TARGET_NAME "@CPACK_PACKAGE_TARGET_NAME@"
+;define app id needed for Windows 8 notifications
+!define AppUserModelId "@TOMAHAWK_APPLICATION_PACKAGE_NAME@"
+
+!define MINGW_BIN "${MINGW_ROOT}/bin"
+!define MINGW_LIB "${MINGW_ROOT}/lib"
+!define MINGW_SHARE "${MINGW_ROOT}/share"
+
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
-!define QT_DLL_PATH "${MING_BIN}"
-!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
-!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
+!define QT_DLL_PATH "${MINGW_BIN}"
+!define QT_QML_PATH "${MINGW_SHARE}/qt5/qml"
+!define SQLITE_DLL_PATH "${MINGW_LIB}/qt5/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MINGW_LIB}/qt5/plugins/imageformats"

 ; We use official release plugins
 ; mingw32-vlc from obs misses a lot and has even broken ones probably
@@ -52,11 +60,11 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
-Caption "Tomahawk Installer"
-BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
+Caption "${APPLICATION_NAME} Installer"
+BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-InstallDirRegKey HKCU "Software\Tomahawk" ""
+InstallDirRegKey HKCU "Software\{APPLICATION_NAME}" ""
 InstType Standard
 InstType Full
 InstType Minimal
@@ -79,12 +87,18 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include WinVer.nsh ;Windows version detection.
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
 !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
+!include ${NSI_PATH}\SnoreNotify.nsh ; Macro for creation of a shortcut with a AppUserModelId.

 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
 ;-----------------------------------------------------------------------------
 !define MEMENTO_REGISTRY_ROOT HKLM
-!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk
+!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
+
+;-----------------------------------------------------------------------------
+; Setup macros for the creation of a shortcut supporting Windows 8 notifications.
+;-----------------------------------------------------------------------------
+!define SnoreToastExe "$INSTDIR\SnoreToast.exe"

 ;-----------------------------------------------------------------------------
 ; Modern User Interface (MUI) defintions and setup.
@@ -147,7 +161,7 @@ Function LaunchTomahawk
 FunctionEnd

 Function LaunchTomahawkAsUser
-   Exec "$INSTDIR\tomahawk.exe"
+   Exec "$INSTDIR\${APPLICATION_NAME}.exe"
 FunctionEnd

 ##############################################################################
@@ -157,31 +171,31 @@ FunctionEnd
 ##############################################################################

 !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess ${processName}
-   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
+   Processes::FindProcess "${processName}"
+   StrCmp $R0 "0" "${gotoWhenNotFound}" "${gotoWhenFound}"
 !macroend

-!macro ConfirmEndProcess processName
+!macro ConfirmEndProcess processTitle processName
   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
-     IDYES process_${processName}_kill IDNO process_${processName}_ended
-   process_${processName}_kill:
+     IDYES "process_${processTitle}_kill" IDNO "process_${processTitle}_ended"
+   process_${processTitle}_kill:
      DetailPrint "Killing ${processName} processes."
-      Processes::KillProcess ${processName}
+      Processes::KillProcess "${processName}"
      Sleep 1500
-      StrCmp $R0 "1" process_${processName}_ended
+      StrCmp $R0 "1" "process_${processTitle}_ended"
      DetailPrint "Process to kill not found!"
-   process_${processName}_ended:
+   process_${processTitle}_ended:
 !macroend

-!macro CheckAndConfirmEndProcess processName
-   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
-   !insertmacro ConfirmEndProcess ${processName}
-   no_process_${processName}_to_end:
+!macro CheckAndConfirmEndProcess processTitle processName
+   !insertmacro CheckForProcess "${processName}" 0 "no_process_${processTitle}_to_end"
+   !insertmacro ConfirmEndProcess "${processTitle}" "${processName}"
+   no_process_${processTitle}_to_end:
 !macroend

 Function EnsureTomahawkShutdown
-   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
+   !insertmacro CheckAndConfirmEndProcess "${TARGET_NAME}" "${APPLICATION_NAME}.exe"
 FunctionEnd

 ##############################################################################
@@ -191,40 +205,40 @@ FunctionEnd
 ##############################################################################

 Function PageReinstall
-   ReadRegStr $R0 HKLM "Software\Tomahawk" ""
+   ReadRegStr $R0 HKLM "Software\${APPLICATION_NAME}" ""
   StrCmp $R0 "" 0 +2
   Abort

   ;Detect version
-   ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMajor"
+   ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
   IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
   minor_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMinor"
+      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
   build_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
+      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
      IntCmp $R0 ${VER_BUILD} same_version new_version older_version

   new_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
      StrCpy $R0 "1"
      Goto reinst_start

   older_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
      StrCpy $R0 "1"
      Goto reinst_start

   same_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall Tomahawk"
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall ${APPLICATION_NAME}"
      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
      StrCpy $R0 "2"

@@ -239,12 +253,12 @@ Function PageLeaveReinstall
   StrCmp $R0 "2" 0 +3
   StrCmp $R1 "1" reinst_done reinst_uninstall
   reinst_uninstall:
-      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString"
+      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString"
      HideWindow
      ClearErrors
      ExecWait '$R1 _?=$INSTDIR'
      IfErrors no_remove_uninstaller
-      IfFileExists "$INSTDIR\tomahawk.exe" no_remove_uninstaller
+      IfFileExists "$INSTDIR\${APPLICATION_NAME}.exe" no_remove_uninstaller
      Delete $R1
      RMDir $INSTDIR
   no_remove_uninstaller:
@@ -260,38 +274,40 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
+Section "${APPLICATION_NAME}" SEC_TOMAHAWK_PLAYER
   SectionIn 1 2 3 RO
   SetDetailsPrint listonly

   SetDetailsPrint textonly
-   DetailPrint "Installing Tomahawk Player essentials."
+   DetailPrint "Installing ${APPLICATION_NAME} essentials."
   SetDetailsPrint listonly
   SetOutPath "$INSTDIR"

   !ifdef INSTALL_PATH
        ;Main executable.
-        File "${INSTALL_PATH}\bin\tomahawk.exe"
+        File "${INSTALL_PATH}\bin\${APPLICATION_NAME}.exe"

-        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
+        File "${INSTALL_PATH}\bin\${TARGET_NAME}_crash_reporter.exe"

-        File "${INSTALL_PATH}\bin\libtomahawk.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk-widgets.dll"
+        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}.dll"
+        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-widgets.dll"
+        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-playdarapi.dll"

        ; plugins
-        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
+        File "${INSTALL_PATH}\lib\lib${TARGET_NAME}_*_*.dll"
   !endif
   !ifndef INSTALL_PATH
        ;Main executable.
-        File "${BUILD_PATH}\tomahawk.exe"
+        File "${BUILD_PATH}\${APPLICATION_NAME}.exe"

-        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
+        File "${BUILD_PATH}\${TARGET_NAME}_crash_reporter.exe"

-        File "${BUILD_PATH}\libtomahawk.dll"
-        File "${BUILD_PATH}\libtomahawk-widgets.dll"
+        File "${BUILD_PATH}\lib${TARGET_NAME}.dll"
+        File "${BUILD_PATH}\lib${TARGET_NAME}-widgets.dll"
+        File "${BUILD_PATH}\lib${TARGET_NAME}-playdarapi.dll"

        ; plugins
-        File "${BUILD_PATH}\libtomahawk_*_*.dll"
+        File "${BUILD_PATH}\lib${TARGET_NAME}_*_*.dll"
   !endif

   ;License & release notes.
@@ -299,75 +315,139 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt

   ;QT stuff:
-   File "${QT_DLL_PATH}\QtCore4.dll"
-   File "${QT_DLL_PATH}\QtGui4.dll"
-   File "${QT_DLL_PATH}\QtNetwork4.dll"
-   File "${QT_DLL_PATH}\QtSql4.dll"
-   File "${QT_DLL_PATH}\QtScript4.dll"
-   File "${QT_DLL_PATH}\QtUiTools4.dll"
-   File "${QT_DLL_PATH}\QtWebKit4.dll"
-   File "${QT_DLL_PATH}\QtXml4.dll"
-   File "${QT_DLL_PATH}\QtSvg4.dll"
+    File "${QT_DLL_PATH}\Qt5Network.dll"
+    File "${QT_DLL_PATH}\Qt5Qml.dll"
+    File "${QT_DLL_PATH}\Qt5Sql.dll"
+    File "${QT_DLL_PATH}\Qt5Xml.dll"
+    File "${QT_DLL_PATH}\Qt5Core.dll"
+    File "${QT_DLL_PATH}\Qt5OpenGL.dll"
+    File "${QT_DLL_PATH}\Qt5Quick.dll"
+    File "${QT_DLL_PATH}\Qt5Svg.dll"
+    File "${QT_DLL_PATH}\Qt5Widgets.dll"
+    File "${QT_DLL_PATH}\Qt5Gui.dll"
+    File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
+    File "${QT_DLL_PATH}\Qt5Sensors.dll"
+    File "${QT_DLL_PATH}\Qt5WebKit.dll"
+    File "${QT_DLL_PATH}\Qt5WinExtras.dll"
+    File "${QT_DLL_PATH}\Qt5WebKit.dll"
+    File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
+    File "${QT_DLL_PATH}\Qt5Multimedia.dll"
+    File "${QT_DLL_PATH}\Qt5MultimediaWidgets.dll"
+    File "${QT_DLL_PATH}\Qt5Positioning.dll"

-   ;SQLite driver
-   SetOutPath "$INSTDIR\sqldrivers"
-   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
-   SetOutPath "$INSTDIR"
+    ;Qt deps
+    File "${QT_DLL_PATH}\libpcre16-0.dll"
+    File "${QT_DLL_PATH}\libxml2-2.dll"
+    File "${QT_DLL_PATH}\libxslt-1.dll"
+    File "${QT_DLL_PATH}\libEGL.dll"
+    File "${QT_DLL_PATH}\libGLESv2.dll"
+    File "${QT_DLL_PATH}\libwebp-5.dll"
+    File "${QT_DLL_PATH}\icuuc56.dll"
+    File "${QT_DLL_PATH}\icudata56.dll"
+    File "${QT_DLL_PATH}\icui18n56.dll"

-   ;Image plugins
-   SetOutPath "$INSTDIR\imageformats"
-   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qsvg4.dll"
-   SetOutPath "$INSTDIR"
+    ;SQLite driver
+    SetOutPath "$INSTDIR\sqldrivers"
+    File "${SQLITE_DLL_PATH}\qsqlite.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libsqlite3-0.dll"

-   ;Cygwin/c++ stuff
-   ;File "${MING_BIN}\cygmad-0.dll"
-   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
-   ;File "${MING_BIN}\mingwm10.dll"
-   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
-   File "${MING_BIN}\libstdc++-6.dll"
+    ;Qt platform plugins
+    SetOutPath "$INSTDIR\platforms"
+     File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
+    SetOutPath "$INSTDIR"

-   ;Phonon stuff
-   File "${MING_BIN}\libphonon.dll"
-   SetOutPath "$INSTDIR\phonon_backend"
-   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
-   SetOutPath "$INSTDIR"
+    ;Image plugins
+    SetOutPath "$INSTDIR\imageformats"
+    File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
+    File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
+    SetOutPath "$INSTDIR"

-   ;VLC
-   File "${VLC_BIN}\libvlc.dll"
-   File "${VLC_BIN}\libvlccore.dll"
-   SetOutPath "$INSTDIR\plugins"
-   File /r "${VLC_PLUGIN_PATH}\*.dll"
-   SetOutPath "$INSTDIR"
+    ;Qt qml plugins
+    SetOutPath "$INSTDIR\QtQuick.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
+    SetOutPath "$INSTDIR\QtQuick\Window.2"
+    File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
+    SetOutPath "$INSTDIR"

-   ; Other
-   File "${MING_BIN}\libqjson.dll"
-   File "${MING_BIN}\libtag.dll"
-   File "${MING_BIN}\libpng15-15.dll"
-   File "${MING_BIN}\libjpeg-8.dll"
-   File "${MING_BIN}\zlib1.dll"
+    ;Cygwin/c++ stuff
+    File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
+    File "${MINGW_BIN}\libstdc++-6.dll"

-   File "${MING_BIN}\libechonest.dll"
-   File "${MING_BIN}\liblastfm.dll"
-   File "${MING_BIN}\libQTweetLib.dll"
-   File "${MING_BIN}\libquazip.dll"
-   File "${MING_BIN}\libqtkeychain.dll"
+    ;VLC
+    File "${VLC_BIN}\libvlc.dll"
+    File "${VLC_BIN}\libvlccore.dll"
+    SetOutPath "$INSTDIR\plugins"
+    File /r "${VLC_PLUGIN_PATH}\*.dll"
+    SetOutPath "$INSTDIR"
+
+    ; Other
+    File "${MINGW_BIN}\libtag.dll"
+    File "${MINGW_BIN}\libpng16-16.dll"
+    File "${MINGW_BIN}\libjpeg-8.dll"
+    File "${MINGW_BIN}\zlib1.dll"
+    File "${MINGW_BIN}\libfreetype-6.dll"
+    File "${MINGW_BIN}\libglib-2.0-0.dll"
+    File "${MINGW_BIN}\libharfbuzz-0.dll"
+
+    ; ANGLE
+    File "${MINGW_BIN}\D3DCompiler_43.dll"
+
+    File "${MINGW_BIN}\libechonest5.dll"
+    File "${MINGW_BIN}\liblastfm5.dll"
+    File "${MINGW_BIN}\libquazip5.dll"
+    File "${MINGW_BIN}\libqt5keychain.dll"
+
+    ; GnuTLS
+    File "${MINGW_BIN}\libgnutls-28.dll"
+    File "${MINGW_BIN}\libtasn1-6.dll"
+    File "${MINGW_BIN}\libgmp-10.dll"
+    File "${MINGW_BIN}\libhogweed-4-1.dll"
+    File "${MINGW_BIN}\libintl-8.dll"
+    File "${MINGW_BIN}\libnettle-6-1.dll"
+    File "${MINGW_BIN}\libp11-kit-0.dll"
+    File "${MINGW_BIN}\libffi-6.dll"
+
+    ; Snorenotify
+    File "${MINGW_BIN}\SnoreToast.exe"
+    File "${MINGW_BIN}\libsnore-qt5.dll"
+    File "${MINGW_BIN}\libsnoresettings-qt5.dll"
+    File "${MINGW_BIN}\snoresettings.exe"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_growl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snarl.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snore.dll"
+    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_windowstoast.dll"
+
+    ; Snoregrowl
+    File "${MINGW_BIN}\libsnoregrowl++.dll"
+    File "${MINGW_BIN}\libsnoregrowl.dll"

   ; Jabber
-   File "${MING_BIN}\libjreen.dll"
-   File "${MING_BIN}\libqca.dll"
-   SetOutPath "$INSTDIR\crypto"
-   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
-   SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libssl-8.dll"
-   File "${MING_BIN}\libcrypto-8.dll"
+    File "${MINGW_BIN}\libjreen-qt5.dll"
+    File "${MINGW_BIN}\libidn-11.dll"
+    File "${MINGW_BIN}\libgsasl-7.dll"
+    File "${MINGW_BIN}\libqca-qt5.dll"
+    SetOutPath "$INSTDIR\crypto"
+    File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
+    SetOutPath "$INSTDIR"
+    File "${MINGW_BIN}\libssl-10.dll"
+    File "${MINGW_BIN}\libcrypto-10.dll"

-   File "${MING_BIN}\libclucene-core.dll"
-   File "${MING_BIN}\libclucene-shared.dll"
+    ; LucenePlusPlus
+    File "${MINGW_BIN}\liblucene++.dll"
+    File "${MINGW_BIN}\libboost_system-mt.dll"
+    File "${MINGW_BIN}\libboost_filesystem-mt.dll"
+    File "${MINGW_BIN}\libboost_iostreams-mt.dll"
+    File "${MINGW_BIN}\libboost_regex-mt.dll"
+    File "${MINGW_BIN}\libboost_thread-mt.dll"
+    File "${MINGW_BIN}\libbz2-1.dll"

-   File "${MING_BIN}\libqtsparkle.dll"
-   File "${MING_BIN}\libattica.dll"
+    File "${MINGW_BIN}\libqtsparkle-qt5.dll"
+    File "${MINGW_BIN}\libKF5Attica.dll"
 SectionEnd

 SectionGroup "Shortcuts"
@@ -376,15 +456,16 @@ SectionGroup "Shortcuts"
   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
      SectionIn 1 2
      SetDetailsPrint textonly
-      DetailPrint "Adding shortcuts for the Tomahawk program group to the Start Menu."
+      DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
      SetDetailsPrint listonly
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\Tomahawk"
-      CreateDirectory "$SMPROGRAMS\Tomahawk"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
+      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Notification Settings.lnk" "$INSTDIR\snoresettings.exe" "-a ${APPLICATION_NAME}"
+      !insertmacro SnoreShortcut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe" "${AppUserModelId}"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
      SetShellVarContext current
   ${MementoSectionEnd}
 !endif
@@ -395,7 +476,7 @@ SectionGroup "Shortcuts"
      SetDetailsPrint textonly
      DetailPrint "Creating Desktop Shortcuts"
      SetDetailsPrint listonly
-      CreateShortCut "$DESKTOP\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+      CreateShortCut "$DESKTOP\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe"
   ${MementoSectionEnd}
 !endif

@@ -405,7 +486,7 @@ SectionGroup "Shortcuts"
      SetDetailsPrint textonly
      DetailPrint "Creating Quick Launch Shortcut"
      SetDetailsPrint listonly
-      CreateShortCut "$QUICKLAUNCH\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+      CreateShortCut "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe"
   ${MementoSectionEnd}
 !endif

@@ -416,10 +497,10 @@ ${MementoSectionDone}
 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "Tomahawk player essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "Tomahawk program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for Tomahawk."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for Tomahawk."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "${APPLICATION_NAME} essentials."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 Section -post
@@ -436,32 +517,98 @@ Section -post
   SetDetailsPrint listonly

   ;Version numbers used to detect existing installation version for comparisson.
-   WriteRegStr HKLM "Software\Tomahawk" "" $INSTDIR
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMinor" "${VER_MINOR}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionRevision" "${REVISION}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionBuild" "${VER_BUILD}"
+   WriteRegStr HKLM "Software\${APPLICATION_NAME}" "" $INSTDIR
+   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionRevision" "${REVISION}"
+   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"

   ;Add or Remove Programs entry.
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation" "$INSTDIR"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayName" "Tomahawk"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "Publisher" "Tomahawk-player.org"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayVersion" "${VERSION}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMinor" "${VER_MINOR}.${REVISION}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "URLInfoAbout" "http://tomahawk-player.org/"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "HelpLink" "http://tomahawk-player.org/"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "@TOMAHAWK_ORGANIZATION_DOMAIN@"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}.${REVISION}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "URLInfoAbout" "http://@TOMAHAWK_ORGANIZATION_DOMAIN@/"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "HelpLink" "http://@TOMAHAWK_ORGANIZATION_DOMAIN@/"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoModify" "1"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoRepair" "1"

   ; Register tomahawk:// protocol handler
   WriteRegStr HKCR "tomahawk" "" "URL:Tomahawk Protocol"
   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
-   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR "tomahawk\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
   WriteRegStr HKCR "tomahawk\shell" "" "open"
-   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   ; Register file associations
+   WriteRegStr HKCR ".mp3" "" "MPEG Audio Layer 3"
+   WriteRegStr HKCR ".mp3\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".mp3\shell" "" "open"
+   WriteRegStr HKCR ".mp3\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".oga" "" "Ogg Audio File"
+   WriteRegStr HKCR ".oga\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".oga\shell" "" "open"
+   WriteRegStr HKCR ".oga\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".ogg" "" "Ogg Audio File"
+   WriteRegStr HKCR ".ogg\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".ogg\shell" "" "open"
+   WriteRegStr HKCR ".ogg\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".opus" "" "OPUS File"
+   WriteRegStr HKCR ".opus\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".opus\shell" "" "open"
+   WriteRegStr HKCR ".opus\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".mp4" "" "AAC File"
+   WriteRegStr HKCR ".mp4\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".mp4\shell" "" "open"
+   WriteRegStr HKCR ".mp4\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".aac" "" "AAC File"
+   WriteRegStr HKCR ".aac\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".aac\shell" "" "open"
+   WriteRegStr HKCR ".aac\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".m4a" "" "AAC File"
+   WriteRegStr HKCR ".m4a\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".m4a\shell" "" "open"
+   WriteRegStr HKCR ".m4a\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".mpc" "" "Musepack Audio File"
+   WriteRegStr HKCR ".mpc\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".mpc\shell" "" "open"
+   WriteRegStr HKCR ".mpc\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".wma" "" "Windows Media Audio"
+   WriteRegStr HKCR ".wma\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".wma\shell" "" "open"
+   WriteRegStr HKCR ".wma\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".aiff" "" "AIFF File"
+   WriteRegStr HKCR ".aiff\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".aiff\shell" "" "open"
+   WriteRegStr HKCR ".aiff\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".aif" "" "AIFF File"
+   WriteRegStr HKCR ".aif\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".aif\shell" "" "open"
+   WriteRegStr HKCR ".aif\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".wv" "" "WavePack Audio File"
+   WriteRegStr HKCR ".wv\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".wv\shell" "" "open"
+   WriteRegStr HKCR ".wv\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+
+   WriteRegStr HKCR ".flac" "" "FLAC Audio File"
+   WriteRegStr HKCR ".flac\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR ".flac\shell" "" "open"
+   WriteRegStr HKCR ".flac\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'

   SetDetailsPrint textonly
   DetailPrint "Finsihed."
@@ -479,7 +626,7 @@ Var UnPageUserAppDataCheckbox_State
 Var UnPageUserAppDataEditBox

 Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT "Uninstall Tomahawk" "Remove Tomahawk's data folder from your computer."
+   !insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_NAME}" "Remove ${APPLICATION_NAME}'s data folder from your computer."
   nsDialogs::Create /NOUNLOAD 1018
   Pop $UnPageUserAppDataDialog

@@ -487,10 +634,10 @@ Function un.UnPageUserAppData
      Abort
   ${EndIf}

-   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete Tomahawk's data folder?"
+   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_NAME}'s data folder?"
   Pop $0

-   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\Tomahawk"
+   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
   Pop $UnPageUserAppDataEditBox
   SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0

@@ -508,39 +655,41 @@ Function un.UnPageUserAppDataLeave
 FunctionEnd

 Section Uninstall
-   IfFileExists "$INSTDIR\tomahawk.exe" tomahawk_installed
-      MessageBox MB_YESNO "It does not appear that Tomahawk is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
+   IfFileExists "$INSTDIR\${APPLICATION_NAME}.exe" tomahawk_installed
+      MessageBox MB_YESNO "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
      Abort "Uninstall aborted by user"
   tomahawk_installed:

   ;Delete registry keys.
-   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionBuild"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionMajor"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionMinor"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
-   DeleteRegValue HKLM "Software\Tomahawk" ""
-   DeleteRegKey HKLM "Software\Tomahawk"
+   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
+   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
+   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
+   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
+   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionRevision"
+   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" ""
+   DeleteRegKey HKLM "Software\${APPLICATION_NAME}"

-   DeleteRegKey HKCR "tomahawk"
+   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}"
+   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}Spotify"
+   DeleteRegKey HKCR "${APPLICATION_NAME}"

   ;Start menu shortcuts.
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\Tomahawk"
+      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
      SetShellVarContext current
   !endif

   ;Desktop shortcut.
   !ifdef OPTION_SECTION_SC_DESKTOP
-      IfFileExists "$DESKTOP\Tomahawk.lnk" 0 +2
-         Delete "$DESKTOP\Tomahawk.lnk"
+      IfFileExists "$DESKTOP\${APPLICATION_NAME}.lnk" 0 +2
+         Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
   !endif

   ;Quick Launch shortcut.
   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-      IfFileExists "$QUICKLAUNCH\Tomahawk.lnk" 0 +2
-         Delete "$QUICKLAUNCH\Tomahawk.lnk"
+      IfFileExists "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" 0 +2
+         Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
   !endif

   ;Remove all the Program Files.
@@ -548,7 +697,7 @@ Section Uninstall

   ;Uninstall User Data if option is checked, otherwise skip.
   ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
-      RMDir /r "$LOCALAPPDATA\Tomahawk"
+      RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
   ${EndIf}

   SetDetailsPrint textonly
@@ -602,7 +751,7 @@ Function .onInit

   ;Use available InstallLocation when possible. This is useful in the uninstaller
   ;via re-install, which would otherwise use a default location - a bug.
-   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
+   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation"
   StrCmp $R0 "" SkipSetInstDir
   StrCpy $INSTDIR $R0
   SkipSetInstDir:
--- a/89
+++ b/89
@@ -1,16 +1,91 @@
+Version 0.9.0:
+    * Resolved various playback issues by switching to a new audio engine.
+    * Fixed collection sorting.
+    * Fixed volume/mute state not being reset correctly on startup.
+
+Version 0.8.4:
+    * Fixed drag & drop issues on sidebar.
+    * Fixed starting Tomahawk with a filename as parameter.
+    * Update column view when collection changes.
+    * (Linux) Don't crash on environments with invalid locales.
+
+Version 0.8.3:
+    * Performance improvements for collection browsing.
+    * Improved memory footprint.
+    * Show cloud collections above your friends in the sidebar.
+    * Keep looking for alternative sources even when we found a perfect match.
+    * Fixed crash in network code.
+    * Fixed repeat one/all icons.
+    * Be more lenient about accepting JSPF and M3U playlists.
+    * Improved support for compilation albums.
+    * (Windows) Fixed support for Windows XP.
+    * (OS X) Fixed settings dialog appearance on Yosemite.
+    * (OS X) Fixed SSL errors on Yosemite.
+
+Version 0.8.2:
+    * Show error message if saving tags failed.
+    * Fixed painting issue on search page.
+    * (OS X & Windows) Fixed crash during collection scan.
+
+Version 0.8.1:
+    * Disabled sorting for stations.
+    * Fixed drag & drop behavior in combination with certain resolvers.
+    * Fixed infinite scanning recursion.
+    * Prevented adding dupes to the collection when scanning.
+    * When playing an artist or album, don't give up when the first track
+      in list isn't playable.
+    * Fixed importing M3U playlists.
+    * Sort album grids by artist name.
+    * Fixed painting issue on 'More Albums' grid.
+    * Fixed crash when editing/saving track tags.
+
 Version 0.8.0:
+    * Redesigned - Shiny new interface. Simplified. New icons.
+    * Added Friend Feed.
+    * Now Playing notifications (OS X & Windows) - support for OS-level
+      notification systems (e.g. Notification Center) with fallback to its own
+      native notification system.
+    * Many actions now available in context menu - including Favorite and Send
+      to a Friend.
+    * Drag and drop support for iTunes, Deezer, Beats Music, Rdio, Spotify,
+      SoundCloud links (into Tomahawk) for playlists/tracks/artists/album urls.
+    * Support for clicking source icon for currently playing track in audio
+      controls to take user to associated page on source's site.
+    * Added Hatchet plug-in.
+    * Added Google Play Music and Beats Music support.
+    * Add links to Support site, Bug Reports and Translations to Help menu.
+    * Add "What's New" page to display on first launch (or until dismissed).
+      Also available from Help menu.
+    * Changed label from "Resolvers" and "Services" to more generic "Plug-Ins".
+    * Clarified some labels, help text and status messages.
+    * Changed icon color a bit.
+    * Added "Acoustic" and "Electric" songtypes to Stations options.
+    * Removed some stale Chart sources.
    * Playback Queue now saves its state across sessions.
+    * Queue now moved to sidebar.
    * Added "Inbox" feature, showing incoming song recommendations. Dropping
      a track on a user in the sidebar sends a recommendation to them.
    * You will now be asked whether you want to trust invalid SSL certificates.
-    * Improved connecting between Tomahawk peers and support having multiple IPs
-      (including IPv6)
-    * Added Network Activity showing you the most played tracks of your friends.
-    * JavaScript-Resolver can now handle URLs (e.g. when dropped from a browser)
-      and resolve them to Playlists/Tracks/Artists/Albums
-
-Version 0.7.1:
+    * Improved connecting between Tomahawk peers and support multiple IPs
+      (including IPv6).
+    * Removed Top Loved from sidebar.
+    * Removed Spotify playlist syncing (will return in future versions).
+    * HTTP(S) streaming is now done by Tomahawk instead of the Phonon backend
+      (fixed HTTPS streaming on MacOS).
    * Heavily reduced memory footprint during and after indexing the database.
+    * Retina display and DPI scaling fixes.
+    * New Collection views. Re-added support for tracklist view of Collection.
+    * Added Telepathy support.
+    * Plugin refactoring (and .AXE resolver binaries).
+    * Removed Twitter due to change in Twitter's API.
+    * Removed auto-playlists.
+    * Improved error messages.
+    * Added basic remote control API.
+    * Add support for Opus codec (requires TagLib 1.9).
+    * Support rtmp:// streams.
+    * Support custom headers in CustomUrlHandler.
+    * Fuzzy search indices for JS Resolvers.
+    * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers.

 Version 0.7.0:
    * JavaScript Resolvers can now expose collections.
--- a/Docker/Docker.variables
+++ b/Docker/Docker.variables
@@ -0,0 +1,2 @@
+DOCKER_IMAGE_NAME=tomahawkmusicplayer/ubuntu
+DOCKER_IMAGE_VER=latest
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -0,0 +1,149 @@
+FROM ubuntu:19.04 as base
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    build-essential \
+    ca-certificates \
+    ninja-build \
+    openssh-client \
+    curl \
+    gnupg2 \
+    gosu \
+    wget \
+    locales \
+    git \
+    subversion \
+    make \
+    pkg-config \
+    unzip \
+    xz-utils \
+    software-properties-common \
+    sudo \
+    apt-utils \
+    && rm -rf /var/lib/apt/lists/*
+
+# LLVM/Clang
+ENV CLANG_VERSION=9
+RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+    && apt-add-repository "deb http://apt.llvm.org/disco/ llvm-toolchain-disco-$CLANG_VERSION main" \
+    && apt-get update && apt-get install -y \
+    clang-$CLANG_VERSION \
+    clang-tidy-$CLANG_VERSION \
+    clang-format-$CLANG_VERSION \
+    llvm-$CLANG_VERSION-dev \
+    libclang-$CLANG_VERSION-dev \
+    && update-alternatives \
+    --install /usr/bin/clang clang /usr/bin/clang-$CLANG_VERSION 100 \
+    --slave /usr/bin/clang++ clang++ /usr/bin/clang++-$CLANG_VERSION \
+    --slave /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-$CLANG_VERSION \
+    --slave /usr/bin/clang-format clang-format /usr/bin/clang-format-$CLANG_VERSION
+
+# GCC
+ENV GCC_VERSION=9
+RUN sudo apt-get update \
+    && sudo apt-get install -y --no-install-recommends \
+    g++-$GCC_VERSION \
+    gcc-$GCC_VERSION \
+    && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9
+
+# Tomahawk deps
+RUN sudo apt-get update \
+    && apt-get install -y --no-install-recommends \
+    cmake \
+    libattica-dev \
+    libboost-dev    \
+    libboost-filesystem-dev \
+    libboost-iostreams-dev \
+    libboost-thread-dev \
+    libfftw3-dev \
+    libgnutls28-dev \
+    libgsasl7-dev \
+    liblastfm-dev \
+    liblastfm5-dev \
+    liblucene++-dev \
+    libphonon-dev \
+    libphononexperimental-dev \
+    libqca-qt5-2-dev \
+    libqca2-dev \
+    libqca2-plugins \
+    libqjson-dev \
+    libqt5svg5-dev \
+    libqt5webkit5-dev \
+    libqt5webkit5\
+    libsamplerate0-dev \
+    libsparsehash-dev \
+    libssl-dev \
+    libtelepathy-qt5-dev \
+    libvlc-dev \
+    libvlccore-dev \
+    libx11-dev \
+    libz-dev \
+    qt5-default \
+    qtbase5-dev \
+    qttools5-dev \
+    qttools5-dev-tools \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN git clone  --depth 1 https://github.com/zaphoyd/websocketpp.git --branch master --single-branch websocketpp \
+    && mkdir websocketpp/build && cd websocketpp/build \
+    && cmake .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r websocketpp
+
+RUN git clone --depth 1 https://github.com/frankosterfeld/qtkeychain.git --branch master --single-branch qtkeychain \
+    && mkdir qtkeychain/build && cd qtkeychain/build \
+    && cmake .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r qtkeychain
+
+RUN git clone --depth 1 https://github.com/taglib/taglib.git --branch master --single-branch taglib \
+    && mkdir taglib/build && cd taglib/build \
+    && cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DBUILD_SHARED_LIBS=ON .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r taglib
+
+RUN git clone --depth 1 https://anongit.kde.org/extra-cmake-modules.git --branch master --single-branch ecm \
+    && mkdir ecm/build && cd ecm/build \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r ecm
+
+RUN git clone --depth 1 https://github.com/KDE/attica.git --branch master --single-branch attica \
+    && mkdir attica/build && cd attica/build \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r attica
+
+RUN git clone --depth 1 https://github.com/stachenov/quazip.git --branch master --single-branch quazip \
+    && mkdir quazip/build && cd quazip/build \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r quazip
+
+RUN git clone --depth 1 https://github.com/euroelessar/jreen.git --branch master --single-branch jreen \
+    && mkdir jreen/build && cd jreen/build \
+    && cmake -DCMAKE_BUILD_TYPE=Release .. \
+    && sudo cmake --build . -j 16 --target install \
+    && cd ../.. \
+    && rm -r jreen
+
+# Language
+ENV LANG=en_US.UTF-8
+RUN echo "$LANG UTF-8" > /etc/locale.gen && locale-gen $LANG && update-locale LANG=$LANG
+
+#entrypoint, if it is last here makes it easy to build new image without rebuilding all layers
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY build-and-test.sh /usr/local/bin/build-and-test.sh
+RUN chmod +x /usr/local/bin/build-and-test.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+WORKDIR /tmp/workspace
--- a/Docker/build-and-test.sh
+++ b/Docker/build-and-test.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+mkdir build
+cd build
+cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} ..
+ninja
+ninja install
+env CTEST_OUTPUT_ON_FAILURE=1 ninja test
--- a/Docker/docker-commands.sh
+++ b/Docker/docker-commands.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+get_repository_root(){
+    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
+    echo "$REPOSITORY_ROOT"
+}
+
+get_repository_subdir(){
+    REPOSITORY_ROOT=$(get_repository_root)
+    CUR_DIR=$(pwd)
+    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
+    echo "$SUB_DIR"
+}
+
+# Run commands inside docker container
+_docker_run() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+                --privileged \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" \
+				$*
+}
+
+# 1st command: Run make target inside docker
+docker-make() {
+    _docker_run make "${@}"
+}
+
+# 2nd command: Run bash command inside docker
+docker-run() {
+    _docker_run "${@}"
+}
+
+# 3rd command: Run bash interactive inside docker
+docker-interactive() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --interactive \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
+}
+
+docker-help() {
+    echo "docker-make            - Run a make target inside docker container"
+    echo "docker-run             - Run a specific bash command inside docker container and remove container on exit"
+    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
+    echo "docker-help            - Show this help text"
+}
--- a/Docker/entrypoint.sh
+++ b/Docker/entrypoint.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Add local user
+# Either use the LOCAL_USER_ID if passed in at runtime or
+# fallback
+USER_ID=${LOCAL_USER_ID:-9001}
+USER=docker
+UPWD=Docker!
+
+echo "Starting with USER: $USER and UID : $USER_ID"
+useradd --shell /bin/bash -u $USER_ID -o -c "docker user" -m "$USER"
+export HOME=/home/$USER
+
+# Add user to sudoers
+echo "docker ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/10-installer
+# Add root password
+echo "root":$UPWD | chpasswd
+# Add user password
+echo "$USER:$UPWD" | chpasswd
+
+if [ -z "$CLANG_VERSION" ]; then
+  echo "No CLANG_VERSION set"
+else
+  echo "alias clang=clang-$CLANG_VERSION" >> $HOME/.bashrc
+  echo "alias clang-tidy=clang-tidy-$CLANG_VERSION" >> $HOME/.bashrc
+  echo "alias clang-format=clang-format-$CLANG_VERSION" >> $HOME/.bashrc
+fi
+
+# Startup user
+exec gosu "$USER" "$@"
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -0,0 +1,70 @@
+# Packaging Tomahawk
+
+General distribution agnostic packaging documentation for Linux.
+
+## Stay up to date!
+
+We will try to keep this document up to date, but we also let our packagers know if our dependencies get important updates - especially if they fix crashes or add new features - or if we add completely new ones. Last but not least, of course we want to let you know about new releases of Tomahawk!
+
+If you want to be notified too subscribe to our [Google Group](https://groups.google.com/forum/#!forum/tomahawk-packagers).
+
+## CMake build options
+
+CMake build options are prefixed with ```-D``` and get their value passed after an ```=```.
+You could for example specify the build type like this ```-DCMAKE_BUILD_TYPE=RelWithDebInfo```.
+This document contains only options relevant to packaging, to have a complete overview you should check our CMake scripts yourself. Looking at it the other way round, this also means that you should read everything in here really carefully.
+
+
+##### ```CMAKE_BUILD_TYPE```
+
+Make sure to specify the build type as ```Release``` or even better ```RelWithDebInfo``` if your distribution supports debug packages. If you do not do this, your users might see asserts (that look like crashes to them) which are only really useful to developers.
+
+##### ```CMAKE_INSTALL_LIBDIR``` (PATH)
+
+You can specify the path where Tomahawk install the libs. This is very helpful to support multilib on linux machines. 
+
+##### ```CMAKE_SKIP_RPATH``` (boolean) (default: OFF)
+
+Build without using rpath prevents from overriding of the normal library search path, possibly interfering with local policy and causing problems for multilib, among other issues.
+
+##### ```BUILD_RELEASE``` (boolean) (default: OFF)
+
+If you're not using our tarballs you can turn this on to suppress putting Git revision hashes into the version string. This also disables building tools and tests by default (although you can do that manually) it's more future-proof to simply pass ```-DBUILD_RELEASE=ON``` because we might make use of it in later releases.
+
+##### ```BUILD_TOOLS``` (boolean) (default: OFF, when BUILD_RELEASE=ON)
+
+Tomahawk provides some tools that help highlight where crashes (of course we only crash in theory!) come from. To make them really useful, we need debug symbols to be available. If your distribution supports/allows it, you could put them into the -debug package.
+
+##### ```BUILD_HATCHET``` (boolean) (default: ON)
+
+Build the account plugin for Hatchet (http://hatchet.is). Requires [websocketpp](https://github.com/zaphoyd/websocketpp).
+
+##### ```WITH_CRASHREPORTER``` (boolean) (default: ON)
+
+The crash reporter is built by default if libcrashreporter-qt is available in ```thirdparty/libcrashreporter-qt/``` (for example via git submodule). Usually distributions don't allow packagers to upload debug symbols to the Tomahawk HQ so to give crash reports more meaning for us, that's why we have no standardised submit process in place yet. If you can do that in your distribution, please get in touch with us!
+
+##### ```WITH_UPOWER``` (boolean) (default on Linux: ON)
+
+Build with support for UPower events.
+
+##### ```WITH_GNOMESHORTCUTHANDLER``` (boolean) (default on Linux: ON)
+
+Build with shortcut handler for GNOME.
+
+#### Runtime dependencies
+
+##### QSql
+
+If your distribution splits the QSqlite plugin for QSql into a separate package, make it a requirement of Tomahawk -  otherwise it might fail to start.
+
+##### XMPP / jreen
+
+Either jreen or (at least) Tomahawk's package should require the qca-ossl plugin, otherwise there will be no GTalk/Jabber support.
+
+### Icon caches
+
+In openSUSE there are macros for updating icon caches in KDE and GNOME (```%desktop_database_post[un]``` ```%icon_theme_cache_post[un]```) after [un]installation, check if your distribution offers the same.
+
+### Firewall
+
+Tomahawk offers P2P functionality, if your distribution offers a default firewall, it's nice to support a default profile for the standard Tomahawk P2P-port (50210). (cf. [openSUSE integration](https://build.opensuse.org/package/view_file/KDE:Extra/tomahawk/tomahawk.SuSEfirewall2?expand=1))
--- a/README.md
+++ b/README.md
@@ -1,68 +1,151 @@
-Tomahawk
-========
+# This project is essentially abandoned
+There is no one working on it.
+There isn't much sense in adding any new issues in the issue tracker unless you want to fix them yourself.

-Compiling and running Tomahawk
------------------------------
+# WHAT TOMAHAWK IS

-Compile:
+Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along with them. Let the music play!
+
+![Tomahawk Screenshot](/data/screenshots/tomahawk-screenshot.png?raw=true)
+
+## HOW TOMAHAWK WORKS
+
+Tomahawk is basically a **player for music metadata**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist, Tomahawk will find the right source, for the right user at the right time.  This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible.
+
+## MUSIC SOURCES
+
+* Local music library (MP3, Ogg, FLAC and many other formats)
+* Networked music libraries (other connected computers)
+
+### Subscription Music Services
+
+* Spotify
+* Beats Music
+* Google Play Music (on-demand streaming and music locker)
+* TIDAL
+* Rdio (Android only)
+* Deezer (Android only)
+
+### Free Streaming/Music Promotion Platforms
+
+* Soundcloud
+* Bandcamp
+* Last.fm
+* Jamendo
+* Official.fm
+* YouTube
+
+### Network/Cloud storage
+
+* Ampache
+* Owncloud
+* Subsonic
+* Beets
+
+Third party-developed resolvers have also been written for services like YouTube, Qobuz and others. We've also heard of digital music distributors writing their own for their internal CMSes to help them navigate and preview their content. That's cool.
+
+Packaged binary resolvers (.axes) are available: [here](http://teom.org/axes).
+
+Source code (and examples) can be found in our [Resolver repository](https://github.com/tomahawk-player/tomahawk-resolvers).
+
+## DOWNLOAD TOMAHAWK
+
+You can download one of our nightly or stable builds:
+
+| *BUILD* | MAC / OSX | WINDOWS | LINUX |
+|:-------:|:---------:|:-------:|:-----:|
+|**NIGHTLY** | [**latest**](http://download.tomahawk-player.org/nightly/mac/Tomahawk-latest.dmg) | [**latest**](http://download.tomahawk-player.org/nightly/windows/tomahawk-latest.exe) | [**latest**](https://launchpad.net/~tomahawk/+archive/ubuntu/nightly) (Ubuntu) |
+|**STABLE** | [**0.8.4**](http://download.tomahawk-player.org/Tomahawk-0.8.4.dmg) | [**0.8.4**](http://download.tomahawk-player.org/tomahawk-0.8.4.exe) | [**0.8.4**](http://www.tomahawk-player.org/#page-about) (various distros) |
+
+## BUILD TOMAHAWK
+
+... or you can compile it yourself:

    $ mkdir build && cd build
    $ cmake ..
    $ make

-Start the application on Linux:
+### Detailed Build Instructions

-    $ ./tomahawk
+| Linux: | [Arch](https://github.com/tomahawk-player/tomahawk/wiki/ArchLinux---Build-Instructions) **-** [Debian](https://github.com/tomahawk-player/tomahawk/wiki/Debian-Build-Instructions) **-** [Fedora](https://github.com/tomahawk-player/tomahawk/wiki/Fedora-Build-Instructions) **-** [Ubuntu](https://github.com/tomahawk-player/tomahawk/wiki/Ubuntu---Build-Instructions) |
+|------:|:------|
+| **Windows**: | [**Windows**](https://github.com/tomahawk-player/tomahawk/wiki/Windows-Build-Instructions) |
+| **Mac**: | [**OS X**](https://github.com/tomahawk-player/tomahawk/wiki/OS-X---Build-Instructions) |

-Start the application on OS X:
-
-    $ open tomahawk.app
-
-
-Detailed building instructions for Ubuntu
-----------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_Binary_on_Ubuntu_Precise_(12.04)
-
-Detailed building instructions for OS X
---------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle
-
-Doxygen Documentation
---------------------
-See: http://dev.tomahawk-player.org/api/classes.html
-
-Dependencies
------------
+### Dependencies

 Required dependencies:

-* CMake 2.8.6 - http://www.cmake.org/
-* Qt 4.7.0 - http://qt-project.org/
-* Phonon 4.6.0 - http://phonon.kde.org/
-* QJson 0.7.1 - http://qjson.sourceforge.net/
-* SQLite 3.6.22 - http://www.sqlite.org/
-* TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
-* Boost 1.3 - http://www.boost.org/
-* CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-* libechonest 2.0.3 - http://projects.kde.org/projects/playground/libs/libechonest/
-* Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-* QuaZip 0.4.3 - http://quazip.sourceforge.net/
-* liblastfm 1.0.1 - https://github.com/lastfm/liblastfm/
-* QtKeychain 0.1 - https://github.com/frankosterfeld/qtkeychain/
+* [CMake 3](http://www.cmake.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/)
+* [Boost 1.3](http://www.boost.org/)
+* [Lucene++ 3.0.6](https://github.com/luceneplusplus/LucenePlusPlus/)
+* [Attica 5.6.0](http://ftp.kde.org/stable/attica/)
+* [QuaZip 0.4.3](http://quazip.sourceforge.net/)
+* [liblastfm 1.0.9](https://github.com/lastfm/liblastfm/)
+* [QtKeychain 0.1](https://github.com/frankosterfeld/qtkeychain/)
+* [Sparsehash](https://code.google.com/p/sparsehash/)
+* [GnuTLS](http://gnutls.org/)

-The following dependencies are optional, but recommended:
+If you are using Qt>5.6 you need to build and install QtWebKit

-* Jreen 1.0.5 (1.1.0 will fail, 1.1.1 is fine) - http://qutim.org/jreen/
-* QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib/
+* [QtWebKit](https://github.com/qt/qtwebkit)
+
+The following dependencies are optional (but *recommended*):
+
+* [Jreen 1.1.1](http://qutim.org/jreen/)
+* [Snorenotify 0.5.2](https://github.com/Snorenotify/Snorenotify/)

 Third party libraries that we ship with our source:

-* MiniUPnP 1.6 - http://miniupnp.free.fr/
-* Breakpad - http://code.google.com/p/google-breakpad/
-* Qocoa - https://github.com/mikemcquaid/Qocoa/
-* libqnetwm - http://code.google.com/p/libqnetwm/
-* libqxt (QxtWeb module) - http://libqxt.org/
-* SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap/
-* kdSingleApplicationGuard - http://www.kdab.com/
+* [MiniUPnP 1.6](http://miniupnp.free.fr/)
+* [Qocoa](https://github.com/mikemcquaid/Qocoa/)
+* [libqnetwm](https://code.google.com/p/libqnetwm/)
+* [libqxt](http://libqxt.org/) (QxtWeb module)
+* [SPMediaKeyTap](https://github.com/nevyn/SPMediaKeyTap/)
+* [kdSingleApplicationGuard](http://www.kdab.com/)

-Enjoy!
+## SUPPORT TOMAHAWK
+
+* [Bug / Issue Tracker](https://bugs.tomahawk-player.org/secure/Dashboard.jspa)
+* [Translations](https://www.transifex.com/projects/p/tomahawk/)
+* [Donations](https://flattr.com/thing/169312/Tomahawk)
+
+## GET HELP
+
+* [Support & Feedback](https://tomahawk.uservoice.com)
+* Chat with us in IRC: **#tomahawk** on Freenode, and [Scrollback.io](https://scrollback.io/tomahawk)
+* [Twitter](https://twitter.com/tomahawk)
+* [Facebook](https://facebook.com/tomahawkplayer)
+* [Developer API Documentation](http://dev.tomahawk-player.org/api/classes.html)
+
+## SCREENSHOTS
+
+BROWSE FRIENDS' MUSIC & LISTEN ALONG
+
+![Browse](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998050088_listen-along.jpg)
+
+INBOX - RECEIVED & FORWARDING
+
+![Inbox](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997751044_inbox.jpg)
+
+CHARTS - BILLBOARD'S TASTEMAKER ALBUMS
+
+![Charts](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997901969_charts.jpg)
+
+FRIEND FEED
+
+![Feed](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410971283885_heroshot.png)
+
+DYNAMIC (AUTO-UPDATING) PLAYLIST
+
+![Xspf](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998362549_dynamic-playlist-1.jpg)
+
+PLUG-INS / RESOLVER SETTINGS
+
+![Settings](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998587408_prefs.jpg)
+
+##Enjoy!
--- a/TomahawkAddLibrary.cmake
+++ b/TomahawkAddLibrary.cmake
@@ -4,8 +4,8 @@ function(tomahawk_add_library)
    # parse arguments (name needs to be saved before passing ARGN into the macro)
    set(NAME ${ARGV0})
    set(options NO_INSTALL NO_VERSION)
-    set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION)
-    set(multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS)
+    set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR)
+    set(multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS QT5_MODULES)
    cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    set(LIBRARY_NAME ${NAME})

@@ -25,13 +25,13 @@ function(tomahawk_add_library)
    include_directories(${CMAKE_CURRENT_BINARY_DIR})

    if(LIBRARY_UI)
-        qt_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
+        qt5_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
        list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES})
    endif()

    # add resources from current dir
    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
-        qt_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
+        qt5_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
        list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
        unset(LIBRARY_RC_SOURCES)
    endif()
@@ -45,10 +45,6 @@ function(tomahawk_add_library)
        add_library(${target} SHARED ${LIBRARY_SOURCES})
    endif()

-    # HACK: add qt modules - every lib should define its own set of modules
-    qt5_use_modules(${target} Core Network Widgets Sql Xml DBus)
-
-
    # definitions - can this be moved into set_target_properties below?
    add_definitions(${QT_DEFINITIONS})
    set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
@@ -62,15 +58,21 @@ function(tomahawk_add_library)
        # At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
        # only takes the first one if called multiple times or bails out with wrong number of arguments
        # when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
+        # Dear domme,
+        # "The COMPILE_DEFINITIONS property may be set to a semicolon-separated list"
+        # Sincerely, CMake Documentation
        add_definitions( "-D${LIBRARY_EXPORT_MACRO}" )

        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_COMPILE_DEFINITIONS})
    endif()

    # add link targets
-    target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
+    target_link_libraries(${target} PRIVATE ${TOMAHAWK_LIBRARIES})
    if(LIBRARY_LINK_LIBRARIES)
-        target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES})
+        target_link_libraries(${target} PUBLIC ${LIBRARY_LINK_LIBRARIES})
+    endif()
+    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
+        target_link_libraries(${target} PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES})
    endif()

    # add soversion
@@ -84,13 +86,27 @@ function(tomahawk_add_library)
        set_target_properties(${target} PROPERTIES SOVERSION ${LIBRARY_SOVERSION})
    endif()

+
+    if(NOT LIBRARY_INSTALL_BINDIR)
+        set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
+    endif()
+
    # make installation optional, maybe useful for dummy plugins one day
    if(NOT LIBRARY_NO_INSTALL)
        include(GNUInstallDirs)
        if(NOT LIBRARY_EXPORT)
-            install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            install( TARGETS ${target}
+                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
        else()
-            install(TARGETS ${target} EXPORT ${LIBRARY_EXPORT} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+            install( TARGETS ${target}
+                EXPORT ${LIBRARY_EXPORT}
+                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
        endif()
    endif()
 endfunction()
--- a/TomahawkAddPlugin.cmake
+++ b/TomahawkAddPlugin.cmake
@@ -19,35 +19,50 @@ function(tomahawk_add_plugin)
 #     message("NO_INSTALL: ${PLUGIN_NO_INSTALL}")

    # create target name once for convenience
-    set(target "tomahawk_${PLUGIN_TYPE}_${PLUGIN_NAME}")
+    set(target "${TOMAHAWK_BASE_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}")

-    # determine target type
-    if(NOT ${PLUGIN_SHARED_LIB})
-        set(target_type "MODULE")
-    else()
-        set(target_type "SHARED")
+    # create option to disable plugins
+    string(TOUPPER "${PLUGIN_TYPE}" PLUGIN_TYPE_UPPER)
+    string(TOUPPER "${PLUGIN_NAME}" PLUGIN_NAME_UPPER)
+    set(PLUGIN_OPTION "BUILD_${PLUGIN_TYPE_UPPER}_${PLUGIN_NAME_UPPER}")
+
+    if(NOT DEFINED ${PLUGIN_OPTION})
+        set(${PLUGIN_OPTION} ON)
    endif()

-    list(APPEND tomahawk_add_library_args
-      "${target}"
-      "EXPORT_MACRO" "${PLUGIN_EXPORT_MACRO}"
-      "TARGET_TYPE" "${target_type}"
-      "SOURCES" "${PLUGIN_SOURCES}"
-    )
+    option(${PLUGIN_OPTION} "Build Tomahawk with the ${PLUGIN_NAME} ${PLUGIN_TYPE}" ${${PLUGIN_OPTION}})

-    if(PLUGIN_UI)
-        list(APPEND tomahawk_add_library_args "UI" "${PLUGIN_UI}")
+    if(${PLUGIN_OPTION})
+        # determine target type
+        if(NOT ${PLUGIN_SHARED_LIB})
+            set(target_type "MODULE")
+        else()
+            set(target_type "SHARED")
+        endif()
+
+        list(APPEND tomahawk_add_library_args
+        "${target}"
+        "EXPORT_MACRO" "${PLUGIN_EXPORT_MACRO}"
+        "TARGET_TYPE" "${target_type}"
+        "SOURCES" "${PLUGIN_SOURCES}"
+        )
+
+        if(PLUGIN_UI)
+            list(APPEND tomahawk_add_library_args "UI" "${PLUGIN_UI}")
+        endif()
+
+        if(PLUGIN_LINK_LIBRARIES)
+            list(APPEND tomahawk_add_library_args "LINK_LIBRARIES" "${PLUGIN_LINK_LIBRARIES}")
+        endif()
+
+        if(PLUGIN_COMPILE_DEFINITIONS)
+            list(APPEND tomahawk_add_library_args "COMPILE_DEFINITIONS" ${PLUGIN_COMPILE_DEFINITIONS})
+        endif()
+
+        list(APPEND tomahawk_add_library_args "NO_VERSION")
+
+        list(APPEND tomahawk_add_library_args "INSTALL_BINDIR" "${CMAKE_INSTALL_LIBDIR}")
+
+        tomahawk_add_library(${tomahawk_add_library_args})
    endif()
-
-    if(PLUGIN_LINK_LIBRARIES)
-        list(APPEND tomahawk_add_library_args "LINK_LIBRARIES" "${PLUGIN_LINK_LIBRARIES}")
-    endif()
-
-    if(PLUGIN_COMPILE_DEFINITIONS)
-        list(APPEND tomahawk_add_library_args "COMPILE_DEFINITIONS" ${PLUGIN_COMPILE_DEFINITIONS})
-    endif()
-
-    list(APPEND tomahawk_add_library_args "NO_VERSION")
-
-    tomahawk_add_library(${tomahawk_add_library_args})
 endfunction()
--- a/TomahawkCPack.cmake
+++ b/TomahawkCPack.cmake
@@ -2,7 +2,7 @@ INCLUDE( InstallRequiredSystemLibraries )

 SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )

-SET( CPACK_PACKAGE_FILE_NAME  tomahawk-${TOMAHAWK_VERSION} )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
+SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_TARGET_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686

 # CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
 # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
@@ -13,7 +13,9 @@ SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${TOMAHAWK_DESCRIPTION_SUMMARY} ) #  Des
 SET( CPACK_PACKAGE_INSTALL_DIRECTORY  ${TOMAHAWK_APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
 SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
 SET( CPACK_PACKAGE_NAME  ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name
+SET( CPACK_PACKAGE_TARGET_NAME  ${TOMAHAWK_TARGET_NAME} ) # Used to build library and executable names
 SET( CPACK_PACKAGE_VENDOR  ${TOMAHAWK_ORGANIZATION_NAME} )   # Package vendor name
+SET( TOMAHAWK_APPLICATION_PACKAGE_NAME ${TOMAHAWK_APPLICATION_PACKAGE_NAME} )
 SET( CPACK_PACKAGE_VERSION_MAJOR  ${TOMAHAWK_VERSION_MAJOR} )
 SET( CPACK_PACKAGE_VERSION_MINOR  ${TOMAHAWK_VERSION_MINOR} )
 SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )
@@ -22,7 +24,7 @@ SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )

 SET( CPACK_SOURCE_GENERATOR TGZ )
 SET( CPACK_SOURCE_IGNORE_FILES "/\\\\.git/" ".*~$" ".kate-swp$" "/build_dir/" "/clang/" "/gcc/" "/build/" "/win/" ) # Pattern of files in the source tree that won't be packaged
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME tomahawk-${TOMAHAWK_VERSION} ) # Name of the source package
+SET( CPACK_SOURCE_PACKAGE_FILE_NAME ${TOMAHAWK_APPLICATION_NAME}-${TOMAHAWK_VERSION} ) # Name of the source package
 # CPACK_SOURCE_STRIP_FILES    List of files in the source tree that will be stripped. Starting with CMake 2.6.0 CPACK_SOURCE_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).
 # CPACK_STRIP_FILES   List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).   bin/ccmake;bin/cmake;bin/cpack;bin/ctest
 # CPACK_SYSTEM_NAME   System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.     Linux-i686
--- a/TomahawkConfig.cmake.in
+++ b/TomahawkConfig.cmake.in
@@ -18,4 +18,7 @@ include("${TOMAHAWK_CMAKE_DIR}/TomahawkLibraryDepends.cmake")

 # These are IMPORTED targets created by TomahawkLibraryDepends.cmake
 set(TOMAHAWK_LIBRARIES tomahawklib)
-set(TOMAHAWK_USE_FILE "${TOMAHAWK_CMAKE_DIR}/TomahawkUse.cmake")
+set(TOMAHAWK_USE_FILE "${TOMAHAWK_CMAKE_DIR}/TomahawkUse.cmake")
+set(TOMAHAWK_DEFINITIONS "@TOMAHAWK_DEFINITIONS@")
+set(TOMAHAWK_CXX_FLAGS "@TOMAHAWK_CXX_FLAGS@")
+set(TOMAHAWK_C_FLAGS "@TOMAHAWK_C_FLAGS@")
--- a/TomahawkUse.cmake
+++ b/TomahawkUse.cmake
@@ -1,35 +0,0 @@
-#FIXME: this only handles qt4 and duplicates top level cmakelists: how can we reduce code duplication?
-
-find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED)
-include( ${QT_USE_FILE} )
-
-set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
-    list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
-endif()
-
-find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
-include( ${QT_USE_FILE} )
-
-macro(qt5_use_modules)
-endmacro()
-
-macro(qt_wrap_ui)
-    qt4_wrap_ui(${ARGN})
-endmacro()
-
-macro(qt_add_resources)
-    qt4_add_resources(${ARGN})
-endmacro()
-
-macro(qt_add_translation)
-    qt4_add_translation(${ARGN})
-endmacro()
-
-
-if(NOT TOMAHAWK_CMAKE_DIR)
-    set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
-endif()
-
-include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake" )
-include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddPlugin.cmake" )
--- a/TomahawkUse.cmake.in
+++ b/TomahawkUse.cmake.in
@@ -0,0 +1,10 @@
+if(NOT TOMAHAWK_CMAKE_DIR)
+    set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
+endif()
+
+include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake" )
+include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddPlugin.cmake" )
+
+add_definitions( ${TOMAHAWK_DEFINITIONS} )
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TOMAHAWK_CXX_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TOMAHAWK_C_FLAGS}")
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -5,31 +5,31 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.tomahawk-player.Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_PACKAGE_NAME@</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleVersion</key>
-	<string>TOMAHAWK_VERSION</string>
+	<string>@TOMAHAWK_VERSION@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>TOMAHAWK_VERSION</string>
+	<string>@TOMAHAWK_VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>tomahawk</string>
+	<string>@TOMAHAWK_BASE_TARGET_NAME@</string>
 	<key>CFBundleIconFile</key>
-	<string>Tomahawk.icns</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@.icns</string>
 	<key>CFBundleName</key>
-	<string>Tomahawk</string>
+	<string>@TOMAHAWK_APPLICATION_NAME@</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
+	<string>10.7.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHighResolutionCapable</key>
 	<true />
 	<key>SUFeedURL</key>
-	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
+	<string>@TOMAHAWK_SPARKLE_UPDATE_URL@</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>sparkle_pub.pem</string>
 	<key>SUEnableSystemProfiling</key>
@@ -63,6 +63,174 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>jspf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>Generic.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/jspf</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>JSPF Playlist</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mp3</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>mp3.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/mpeg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>MPEG Audio Layer 3</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>oga</string>
+				<string>ogg</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>ogg.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/ogg</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Ogg Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>opus</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>ogg.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/opus</string>
+				<string>application/opus</string>
+				<string>audio/ogg; codecs=opus</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>OPUS file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aac</string>
+				<string>mp4</string>
+				<string>m4a</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/aac</string>
+				<string>audio/mp4</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>AAC file</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>mpc</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-musepack</string>
+				<string>audio/mpc</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Musepack Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>wma</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-ms-wma</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>Windows Media Audio</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>flac</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/flac</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>FLAC Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>aiff</string>
+				<string>aif</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/aiff</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>AIFF File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>wv</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>audio.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>audio/x-wavpack</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>WavePack Audio File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
 	</array>
 </dict>
 </plist>
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 #
-# Usage: ./admin/mac/build-release-osx.sh [--no-clean]
+# Usage: ./admin/mac/build-release-osx.sh VERSION CERT_SIGNER [--no-clean]
 #
 ################################################################################

+TARGET_NAME="Tomahawk"
+
+set -e

 function header {
    echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -16,43 +19,41 @@ function die {
 }
 ################################################################################

-if [ -z $1 ]
+if [ -z "$2" ]
 then
-    echo This script expects the version number as a parameter, e.g. 1.0.0
+    echo This script expects the version number and cert-signer as parameters, e.g. "1.0.0 John Doe"
    exit 1
 fi

 ROOT=`pwd`
 VERSION=$1
+CERT_SIGNER=$2

 ################################################################################

-    mv tomahawk.app Tomahawk.app
-    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
-
    header "Fixing and copying libraries"
-    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
+    $ROOT/../admin/mac/macdeploy.py "${TARGET_NAME}.app" quiet

-    cd Tomahawk.app
+    cd "${TARGET_NAME}.app"

-    header "Renaming icon"
-    mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
    cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf

-    header "Copying Sparkle framework"
-    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    
-    header "Creating DMG"
-    cd ..
+    header "Fixing fonts"
+    mkdir "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
+    cp -R $ROOT/../data/fonts/*.ttf "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"

    header "Signing bundle"
-    codesign -s "Developer ID Application: Leonardo Franchi" -f -v ./Tomahawk.app
+    cd ..
+    if [ -f ~/sign_step.sh ];
+    then
+        ~/sign_step.sh "$CERT_SIGNER" "${TARGET_NAME}.app"
+    fi
+
+    header "Creating DMG"
+    $ROOT/../admin/mac/create-dmg.sh "${TARGET_NAME}.app"
+    mv "${TARGET_NAME}.dmg" "${TARGET_NAME}-$VERSION.dmg"

-    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
-    mv Tomahawk.dmg Tomahawk-$VERSION.dmg
-    
    header "Creating signed Sparkle update"
-    $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
-    mv Tomahawk.app tomahawk.app
+#     $ROOT/../admin/mac/sign_bundle.rb "${TARGET_NAME}" $VERSION ~/tomahawk_sparkle_privkey.pem

    header "Done!"
--- a/admin/mac/create-dmg.sh
+++ b/admin/mac/create-dmg.sh
@@ -43,7 +43,7 @@ ln -s /Applications "$TMP/Applications"
 cp -R "$IN" "$TMP"

 # create
-hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
+hdiutil makehybrid -hfs -hfs-volume-name "$NAME" -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
 hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$OUT"

 # cleanup
--- a/admin/mac/dmg_background.png
+++ b/admin/mac/dmg_background.png
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#  This file is part of Tomahawk. 
+#  This file is part of Tomahawk.
 #  It was inspired in large part by the macdeploy script in Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
@@ -20,42 +20,41 @@ import re
 import subprocess
 import commands
 import sys
+import glob
+
+TARGET_NAME="tomahawk"

 FRAMEWORK_SEARCH_PATH=[
    '/Library/Frameworks',
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]

-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/opt/vlc/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']

 VLC_PLUGINS=[
-  'libaccess_attachment_plugin.dylib',
+  'libattachment_plugin.dylib',
  #'libaccess_avio_plugin.dylib',
  #'libaccess_fake_plugin.dylib',
-  'libaccess_ftp_plugin.dylib',
-  'libaccess_http_plugin.dylib',
-  'libaccess_imem_plugin.dylib',
+  'libftp_plugin.dylib',
+  'libhttp_plugin.dylib',
+  'libhttplive_plugin.dylib',
+  'libimem_plugin.dylib',
  #'libaccess_mmap_plugin.dylib',
  'libaccess_mms_plugin.dylib',
  'libaccess_realrtsp_plugin.dylib',
-  'libaccess_tcp_plugin.dylib',
-  'libaccess_udp_plugin.dylib',
+  'libtcp_plugin.dylib',
+  'libudp_plugin.dylib',
  'libcdda_plugin.dylib',
  'libfilesystem_plugin.dylib',
  'libqtcapture_plugin.dylib',
  'librtp_plugin.dylib',
  'libzip_plugin.dylib',
-  'libaccess_output_dummy_plugin.dylib',
-  'libaccess_output_file_plugin.dylib',
-  'libaccess_output_http_plugin.dylib',
-  'libaccess_output_shout_plugin.dylib',
-  'libaccess_output_udp_plugin.dylib',
  'liba52tofloat32_plugin.dylib',
  'liba52tospdif_plugin.dylib',
  'libaudio_format_plugin.dylib',
  'libaudiobargraph_a_plugin.dylib',
  'libchorus_flanger_plugin.dylib',
-  'libconverter_fixed_plugin.dylib',
+  #'libconverter_fixed_plugin.dylib',
  'libdolby_surround_decoder_plugin.dylib',
  'libdtstofloat32_plugin.dylib',
  'libdtstospdif_plugin.dylib',
@@ -70,10 +69,10 @@ VLC_PLUGINS=[
  'libspatializer_plugin.dylib',
  'libtrivial_channel_mixer_plugin.dylib',
  'libugly_resampler_plugin.dylib',
-  'libfloat32_mixer_plugin.dylib',
+  'libfloat_mixer_plugin.dylib',
  #'libspdif_mixer_plugin.dylib',
  #'libtrivial_mixer_plugin.dylib',
-  'libaout_file_plugin.dylib',
+  #'libaout_file_plugin.dylib',
  'libauhal_plugin.dylib',
  'liba52_plugin.dylib',
  'libadpcm_plugin.dylib',
@@ -86,7 +85,7 @@ VLC_PLUGINS=[
  'libfaad_plugin.dylib',
  #'libfake_plugin.dylib',
  'libflac_plugin.dylib',
-  'libfluidsynth_plugin.dylib',
+  #'libfluidsynth_plugin.dylib',
  #'libinvmem_plugin.dylib',
  'liblpcm_plugin.dylib',
  'libmpeg_audio_plugin.dylib',
@@ -97,10 +96,10 @@ VLC_PLUGINS=[
  'libtheora_plugin.dylib',
  'libtwolame_plugin.dylib',
  'libvorbis_plugin.dylib',
-  'libgestures_plugin.dylib',
-  'libhotkeys_plugin.dylib',
-  'libmotion_plugin.dylib',
-  'libnetsync_plugin.dylib',
+  #'libgestures_plugin.dylib',
+  #'libhotkeys_plugin.dylib',
+  #'libmotion_plugin.dylib',
+  #'libnetsync_plugin.dylib',
  #'libsignals_plugin.dylib',
  'libaiff_plugin.dylib',
  'libasf_plugin.dylib',
@@ -109,7 +108,7 @@ VLC_PLUGINS=[
  'libavi_plugin.dylib',
  'libdemux_cdg_plugin.dylib',
  'libdemuxdump_plugin.dylib',
-  'libdirac_plugin.dylib',
+  'libdiracsys_plugin.dylib',
  'libes_plugin.dylib',
  'libflacsys_plugin.dylib',
  'liblive555_plugin.dylib',
@@ -139,24 +138,24 @@ VLC_PLUGINS=[
  'libxa_plugin.dylib',
  'libfolder_plugin.dylib',
  'libtaglib_plugin.dylib',
-  'libaudioscrobbler_plugin.dylib',
+  #'libaudioscrobbler_plugin.dylib',
  'libdummy_plugin.dylib',
  'libexport_plugin.dylib',
-  'libfreetype_plugin.dylib',
-  'libgnutls_plugin.dylib',
+  #'libfreetype_plugin.dylib',
+  #'libgnutls_plugin.dylib',
  'liblogger_plugin.dylib',
  'liblua_plugin.dylib',
-  'libosd_parser_plugin.dylib',
-  'libquartztext_plugin.dylib',
-  'libstats_plugin.dylib',
+  #'libosd_parser_plugin.dylib',
+  #'libquartztext_plugin.dylib',
+  #'libstats_plugin.dylib',
  'libvod_rtsp_plugin.dylib',
  'libxml_plugin.dylib',
  #'libxtag_plugin.dylib',
  'libi420_rgb_mmx_plugin.dylib',
  'libi420_yuy2_mmx_plugin.dylib',
  'libi422_yuy2_mmx_plugin.dylib',
-  'libmemcpymmx_plugin.dylib',
-  'libmemcpymmxext_plugin.dylib',
+  #'libmemcpymmx_plugin.dylib',
+  #'libmemcpymmxext_plugin.dylib',
  'libmux_asf_plugin.dylib',
  'libmux_avi_plugin.dylib',
  'libmux_dummy_plugin.dylib',
@@ -179,18 +178,19 @@ VLC_PLUGINS=[
  'libi420_yuy2_sse2_plugin.dylib',
  'libi422_yuy2_sse2_plugin.dylib',
  'libdecomp_plugin.dylib',
-  'libstream_filter_rar_plugin.dylib',
-  'libstream_filter_record_plugin.dylib',
-  'libvisual_plugin.dylib',
+  #'libstream_filter_rar_plugin.dylib',
+  'librecord_plugin.dylib',
+  #'libvisual_plugin.dylib',
+  'libsecuretransport_plugin.dylib'
 ]

 VLC_SEARCH_PATH=[
-    '/usr/local/lib/vlc/plugins/',
+    '/usr/local/opt/vlc/lib/vlc/plugins/',
 ]

 QT_PLUGINS = [
-    'crypto/libqca-ossl.dylib',
-    'phonon_backend/phonon_vlc.so',
+#    'crypto/libqca-ossl.dylib',
+    'platforms/libqcocoa.dylib',
    'sqldrivers/libqsqlite.dylib',
    'imageformats/libqgif.dylib',
    'imageformats/libqico.dylib',
@@ -199,27 +199,41 @@ QT_PLUGINS = [
    'imageformats/libqmng.dylib',
 ]

+SNORE_PLUGINS = [
+    'libsnore_backend_growl.so',
+    'libsnore_backend_osxnotificationcenter.so',
+]
+
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.so',
-  'libtomahawk_account_google.so',
-  'libtomahawk_account_twitter.so',
-  'libtomahawk_account_zeroconf.so',
-  'libtomahawk_infoplugin_adium.so',
-  'libtomahawk_infoplugin_charts.so',
-  'libtomahawk_infoplugin_discogs.so',
-  'libtomahawk_infoplugin_echonest.so',
-  'libtomahawk_infoplugin_hypem.so',
-  'libtomahawk_infoplugin_musicbrainz.so',
-  'libtomahawk_infoplugin_musixmatch.so',
-  'libtomahawk_infoplugin_newreleases.so',
-  'libtomahawk_infoplugin_rovi.so',
-  'libtomahawk_infoplugin_spotify.so',
+  'lib%s_account_xmpp.dylib' % TARGET_NAME,
+  'lib%s_account_google.so' % TARGET_NAME,
+  'lib%s_account_zeroconf.so' % TARGET_NAME,
+  'lib%s_account_hatchet.so' % TARGET_NAME,
+  'lib%s_infoplugin_adium.so' % TARGET_NAME,
+  'lib%s_infoplugin_charts.so' % TARGET_NAME,
+#  'lib%s_infoplugin_discogs.so' % TARGET_NAME,
+  'lib%s_infoplugin_echonest.so' % TARGET_NAME,
+  'lib%s_infoplugin_hypem.so' % TARGET_NAME,
+#  'lib%s_infoplugin_musicbrainz.so' % TARGET_NAME,
+  'lib%s_infoplugin_musixmatch.so' % TARGET_NAME,
+  'lib%s_infoplugin_newreleases.so' % TARGET_NAME,
+#  'lib%s_infoplugin_rovi.so' % TARGET_NAME,
+  'lib%s_infoplugin_snorenotify.so' % TARGET_NAME,
+  'lib%s_infoplugin_spotify.so' % TARGET_NAME,
+  'lib%s_viewpage_dashboard.so' % TARGET_NAME,
+#  'lib%s_viewpage_networkactivity.so' % TARGET_NAME,
+  'lib%s_viewpage_charts.so' % TARGET_NAME,
+  'lib%s_viewpage_newreleases.so' % TARGET_NAME,
+  'lib%s_viewpage_whatsnew_0_8.so' % TARGET_NAME,
 ]

 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.8.4/plugins',
+    '/usr/local/opt/qt5/plugins',
 ]

+SNORE_PLUGINS_SEARCH_PATH=[
+    '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5',
+]

 class Error(Exception):
  pass
@@ -232,11 +246,17 @@ class CouldNotFindQtPluginErrorFindFrameworkError(Error):
 class InstallNameToolError(Error):
  pass

+class CouldNotFindFrameworkError(Error):
+  pass

 class CouldNotFindQtPluginError(Error):
  pass


+class CouldNotFindSnorePluginError(Error):
+  pass
+
+
 class CouldNotFindVLCPluginError(Error):
  pass

@@ -245,19 +265,22 @@ class CouldNotFindScriptPluginError(Error):
  pass


-
 if len(sys.argv) < 2:
  print 'Usage: %s <bundle.app>' % sys.argv[0]

 bundle_dir = sys.argv[1]
-
 bundle_name = os.path.basename(bundle_dir).split('.')[0]

 commands = []
+framework_paths = []

 binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
 frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
 commands.append(['mkdir', '-p', frameworks_dir])
+vlcplugins_dir = os.path.join(frameworks_dir, 'vlc', 'plugins')
+commands.append(['mkdir', '-p', vlcplugins_dir])
+snoreplugins_dir = os.path.join(binary_dir, 'libsnore')
+commands.append(['mkdir', '-p', snoreplugins_dir])
 resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
 commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
@@ -286,7 +309,7 @@ def GetBrokenLibraries(binary):
      continue  # unix style system library
    elif re.match(r'Breakpad', line):
      continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line) and not re.match(r'^\s*@loader_path/../lib', line):
      # Potentially already fixed library
      if '.framework' in line:
        relative_path = os.path.join(*line.split('/')[3:])
@@ -310,6 +333,11 @@ def FindFramework(path):
    if os.path.exists(abs_path):
      return abs_path

+  # replace rpath with /Library/Frameworks for Sparkle
+  abs_path = path.replace("@rpath/", "/Library/Frameworks/")
+  if os.path.exists(abs_path):
+    return abs_path
+
  raise CouldNotFindFrameworkError(path)

 def FindLibrary(path):
@@ -369,12 +397,12 @@ def FixLibrary(path):
  for library in broken_libs['libs']:
    FixLibraryInstallPath(library, new_path)

-def FixVLCPlugin(abs_path, subdir):
+def FixVLCPlugin(abs_path):
  broken_libs = GetBrokenLibraries(abs_path)
  FixAllLibraries(broken_libs)

  #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path))
+  new_path = os.path.join(vlcplugins_dir, os.path.basename(abs_path))
  args = ['mkdir', '-p', os.path.dirname(new_path)]
  commands.append(args)
  args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
@@ -427,7 +455,14 @@ def CopyFramework(path):
  for i, part in enumerate(parts):
    if re.match(r'\w+\.framework', part):
      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      framework_name = part.split(".framework")[0]
      break
+
+  if full_path in framework_paths:
+    return os.path.join(full_path, parts[-1])
+
+  framework_paths.append(full_path)
+
  args = ['mkdir', '-p', full_path]
  commands.append(args)
  args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path]
@@ -437,9 +472,44 @@ def CopyFramework(path):

  menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib')
  if os.path.exists(menu_nib):
-    args = ['cp', '-r', menu_nib, resources_dir]
+    args = ['cp', '-rf', menu_nib, resources_dir]
    commands.append(args)

+  # Fix framework structure for signing
+  path_base_dir = os.path.join(os.path.split(path)[0], '..', '..')
+  path_versions_dir = os.path.join(path_base_dir, 'Versions')
+
+  if not os.path.exists(os.path.join(full_path, 'Versions', 'Current')):
+    framework_base_dir = os.path.join(full_path, '..', '..')
+    framework_versions_dir = os.path.join(framework_base_dir, 'Versions')
+
+    versionParts = glob.glob(path_versions_dir+'/*')[0].split(os.sep)
+    args = ['ln', '-s', versionParts[-1], framework_versions_dir+'/Current']
+    commands.append(args)
+
+    args = ['ln', '-s', 'Versions/Current/'+framework_name, framework_base_dir+'/'+framework_name]
+    commands.append(args)
+
+    args = ['ln', '-s', 'Versions/Current/Resources', framework_base_dir+'/Resources']
+    commands.append(args)
+
+  # Copy Contents/Info.plist to Resources/Info.plist if Resources/Info.plist does not exist
+  # If Contents/Info.plist doesn't exist either, error out. If we actually see this, we can copy QtCore's Info.plist
+  info_plist_in_resources = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
+  if os.path.exists(info_plist_in_resources):
+    info_plist_in_contents = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
+    framework_resources_dir = os.path.join(framework_versions_dir, versionParts[-1], 'Resources')
+    args = ['mkdir', '-p', framework_resources_dir]
+    commands.append(args)
+    if os.path.exists(info_plist_in_contents):
+      args = ['cp', '-rf', info_plist_in_contents, framework_resources_dir]
+      commands.append(args)
+      args = ['chmod', '+rw', os.path.join(framework_resources_dir, 'Info.plist')]
+      commands.append(args)
+    else:
+      print "%s: Framework does not contain an Info.plist file in Resources/ folder." % (path)
+      sys.exit(-1)
+
  return os.path.join(full_path, parts[-1])

 def FixId(path, library_name):
@@ -489,6 +559,12 @@ def FindQtPlugin(name):
        return os.path.join(path, name)
  raise CouldNotFindQtPluginError(name)

+def FindSnorePlugin(name):
+  for path in SNORE_PLUGINS_SEARCH_PATH:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindSnorePluginError(name)

 def FindVLCPlugin(name):
  for path in VLC_SEARCH_PATH:
@@ -500,15 +576,18 @@ def FindVLCPlugin(name):
 FixBinary(binary)

 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin))

 for plugin in TOMAHAWK_PLUGINS:
  FixPlugin(plugin, '../MacOS')

+for plugin in SNORE_PLUGINS:
+  FixPlugin(FindSnorePlugin(plugin), '../lib/plugins/libsnore-qt5')
+
 try:
-  FixPlugin('tomahawk_crash_reporter', '../MacOS')
+  FixPlugin('%s_crash_reporter' % TARGET_NAME, '../MacOS')
 except:
-  print 'Failed to find tomahawk_crash_reporter'
+  print 'Failed to find %s_crash_reporter' % TARGET_NAME

 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
--- a/admin/mac/sign_bundle.rb
+++ b/admin/mac/sign_bundle.rb
@@ -6,9 +6,9 @@ if ARGV.length < 2
  exit
 end

-tarball = "tomahawk-#{ARGV[0]}.tar.bz2"
+tarball = "#{ARGV[0].downcase}-#{ARGV[1]}.tar.bz2"
 puts "Zipping: #{tarball}..."
-`tar jcvf "#{tarball}" Tomahawk.app`
+`tar jcvf "#{tarball}" #{ARGV[0]}.app`

 puts "Signing..."
-puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64`
+puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[2]}" | openssl enc -base64`
--- a/admin/unix/tomahawk.desktop
+++ b/admin/unix/tomahawk.desktop
@@ -6,14 +6,16 @@ GenericName=Music Player
 GenericName[de]=Musik Player
 GenericName[fi]=Musiikkisoitin
 GenericName[pl]=Odtwarzacz Muzyki
+GenericName[ro]=Redare muzică
 GenericName[se]=Musikspelare
 TryExec=tomahawk
 Exec=tomahawk %u
-Comment=Tomahawk — Social Music Player
+Comment=Tomahawk — Multi Source Music Player
 Comment[fi]=Tomahawk – sosiaalinen musiikkisoitin
 Comment[pl]=Tomahawk – Społecznościowy Odtwarzacz Muzyki
+Comment[ro]=Tomahawk – Redare muzică în mod social
 Comment[se]=Tomahawk — Den Sociala Musikspelaren
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;
+MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/opus;application/opus;audio/x-vorbis;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;application/xspf+xml;application/jspf;
--- a/admin/unix/tomahawk.protocol
+++ b/admin/unix/tomahawk.protocol
@@ -1,12 +0,0 @@
-[Protocol]
-exec=/path/to/binary "%u"
-protocol=tomahawk
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-
--- a/admin/win/Toolchain-mingw32-openSUSE.cmake
+++ b/admin/win/Toolchain-mingw32-openSUSE.cmake
@@ -7,7 +7,9 @@ SET(CMAKE_SYSTEM_NAME Windows)
 # specify the cross compiler
 SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
 SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
-SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}-windres)
+SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres CACHE FILEPATH "windres")
+SET(CMAKE_AR /usr/bin/${MINGW_PREFIX}-ar CACHE FILEPATH "ar")
+

 # where is the target environment containing libraries
 SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -26,9 +28,11 @@ SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
 SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
 SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)

-# qt tools
-SET(QT_QMAKE_EXECUTABLE     ${MINGW_PREFIX}-qmake )
-SET(QT_MOC_EXECUTABLE       ${MINGW_PREFIX}-moc)
-SET(QT_RCC_EXECUTABLE       ${MINGW_PREFIX}-rcc)
-SET(QT_UIC_EXECUTABLE       ${MINGW_PREFIX}-uic)
-SET(QT_LRELEASE_EXECUTABLE  ${MINGW_PREFIX}-lrelease)
+SET(QT_QMAKE_EXECUTABLE     /usr/bin/${MINGW_PREFIX}-qmake CACHE FILEPATH "qmake" )
+SET(QT_MOC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-moc CACHE FILEPATH "moc")
+SET(QT_RCC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-rcc CACHE FILEPATH "rcc")
+SET(QT_UIC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-uic CACHE FILEPATH "uic")
+SET(QT_LRELEASE_EXECUTABLE  /usr/bin/${MINGW_PREFIX}-lrelease CACHE FILEPATH "lrelease")
+
+# phonon -_-
+SET(Automoc4_DIR	    "/usr/lib64/automoc4/")
--- a/admin/win/nsi/SnoreNotify.nsh
+++ b/admin/win/nsi/SnoreNotify.nsh
@@ -0,0 +1,22 @@
+!include LogicLib.nsh
+!include WordFunc.nsh
+
+Function SnoreWinVer
+    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+    ${VersionCompare} "6.2" $R0 $R0
+    ${If} $R0 == 1
+        Push "NotWin8"
+    ${Else}
+        Push "AtLeastWin8"
+    ${EndIf}
+FunctionEnd
+
+!macro SnoreShortcut path exe appID
+    Call SnoreWinVer
+    Pop $0
+    ${If} $0 == "AtLeastWin8"
+        nsExec::ExecToLog '"${SnoreToastExe}" -install "${path}" "${exe}" "${appID}"'
+    ${Else}
+        CreateShortCut "${path}" "${exe}"
+    ${EndIf}
+!macroend
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/admin/win/nsi/welcome.bmp
+++ b/admin/win/nsi/welcome.bmp
--- a/admin/win/update-vlc.sh
+++ b/admin/win/update-vlc.sh
@@ -9,19 +9,20 @@ fi

 rm -rvf vlc/

+VLC_TARBALL="vlc.tar.bz2"

 echo "Download phonon archive..."
 # wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
 # wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
 # wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
 # wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
-wget -c http://download.tomahawk-player.org/test/pvlc.tar.bz2
+wget -c "http://download.tomahawk-player.org/test/$VLC_TARBALL"

 echo "Extract binary..."
 # 7z x phonon*.7z
 # mv -v vlc-*/ vlc/
 # unzip tomahawk-vlc-0.1.zip
-tar xvjf pvlc.tar.bz2
+tar xvjf "$VLC_TARBALL"

 # echo "Download phonon_vlc_no_video.dll..."
 # wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
@@ -50,6 +51,7 @@ tar xvjf pvlc.tar.bz2


 # this is for vlc-2.x
+cd vlc/plugins
 rm -rvf \
    video_*/ \
    gui/ \
@@ -68,17 +70,18 @@ rm -rvf \
    services_discovery/ \
    visualization/ \
    control/ \
-    misc/ \
    **/libi420* \
    **/libi422* \
    mux/ \
-    stream_filter/ \
+    stream_filter/*dash* \
+    stream_filter/*smooth* \
+    stream_filter/*record* \
    **/libtheora_plugin* \
    **/liblibbluray_plugin* \
    **/libdtv_plugin* \
    **/*.dll.a \
-    **/*.la
+    **/*.la \
+    misc/liblogger_plugin*


 echo "Downloaded and stripped VLC"
-
--- a/data/fonts/FaunaOne-Regular.ttf
+++ b/data/fonts/FaunaOne-Regular.ttf
--- a/data/fonts/PathwayGothicOne-Regular.ttf
+++ b/data/fonts/PathwayGothicOne-Regular.ttf
--- a/data/fonts/Roboto-Black.ttf
+++ b/data/fonts/Roboto-Black.ttf
--- a/data/fonts/Roboto-BlackItalic.ttf
+++ b/data/fonts/Roboto-BlackItalic.ttf
--- a/data/fonts/Roboto-Bold.ttf
+++ b/data/fonts/Roboto-Bold.ttf
--- a/data/fonts/Roboto-BoldItalic.ttf
+++ b/data/fonts/Roboto-BoldItalic.ttf
--- a/data/fonts/Roboto-Italic.ttf
+++ b/data/fonts/Roboto-Italic.ttf
--- a/data/fonts/Roboto-Light.ttf
+++ b/data/fonts/Roboto-Light.ttf
--- a/data/fonts/Roboto-LightItalic.ttf
+++ b/data/fonts/Roboto-LightItalic.ttf
--- a/data/fonts/Roboto-Medium.ttf
+++ b/data/fonts/Roboto-Medium.ttf
--- a/data/fonts/Roboto-MediumItalic.ttf
+++ b/data/fonts/Roboto-MediumItalic.ttf
--- a/data/fonts/Roboto-Regular.ttf
+++ b/data/fonts/Roboto-Regular.ttf
--- a/data/fonts/Roboto-Thin.ttf
+++ b/data/fonts/Roboto-Thin.ttf
--- a/data/fonts/Roboto-ThinItalic.ttf
+++ b/data/fonts/Roboto-ThinItalic.ttf
--- a/data/fonts/RobotoCondensed-Bold.ttf
+++ b/data/fonts/RobotoCondensed-Bold.ttf
--- a/data/fonts/RobotoCondensed-BoldItalic.ttf
+++ b/data/fonts/RobotoCondensed-BoldItalic.ttf
--- a/data/fonts/RobotoCondensed-Italic.ttf
+++ b/data/fonts/RobotoCondensed-Italic.ttf
--- a/data/fonts/RobotoCondensed-Light.ttf
+++ b/data/fonts/RobotoCondensed-Light.ttf
--- a/data/fonts/RobotoCondensed-LightItalic.ttf
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
--- a/data/fonts/RobotoCondensed-Regular.ttf
+++ b/data/fonts/RobotoCondensed-Regular.ttf
--- a/data/fonts/TitilliumWeb-Black.ttf
+++ b/data/fonts/TitilliumWeb-Black.ttf
--- a/data/fonts/TitilliumWeb-Bold.ttf
+++ b/data/fonts/TitilliumWeb-Bold.ttf
--- a/data/fonts/TitilliumWeb-BoldItalic.ttf
+++ b/data/fonts/TitilliumWeb-BoldItalic.ttf
--- a/data/fonts/TitilliumWeb-ExtraLight.ttf
+++ b/data/fonts/TitilliumWeb-ExtraLight.ttf
--- a/data/fonts/TitilliumWeb-ExtraLightItalic.ttf
+++ b/data/fonts/TitilliumWeb-ExtraLightItalic.ttf
--- a/data/fonts/TitilliumWeb-Italic.ttf
+++ b/data/fonts/TitilliumWeb-Italic.ttf
--- a/data/fonts/TitilliumWeb-Light.ttf
+++ b/data/fonts/TitilliumWeb-Light.ttf
--- a/data/fonts/TitilliumWeb-LightItalic.ttf
+++ b/data/fonts/TitilliumWeb-LightItalic.ttf
--- a/data/fonts/TitilliumWeb-Regular.ttf
+++ b/data/fonts/TitilliumWeb-Regular.ttf
--- a/data/fonts/TitilliumWeb-SemiBold.ttf
+++ b/data/fonts/TitilliumWeb-SemiBold.ttf
--- a/data/fonts/TitilliumWeb-SemiBoldItalic.ttf
+++ b/data/fonts/TitilliumWeb-SemiBoldItalic.ttf
--- a/data/icons/1024x1024-tomahawk-icon.png
+++ b/data/icons/1024x1024-tomahawk-icon.png
--- a/data/icons/128x128-tomahawk-grayscale-icon.png
+++ b/data/icons/128x128-tomahawk-grayscale-icon.png
--- a/data/icons/128x128-tomahawk-icon.png
+++ b/data/icons/128x128-tomahawk-icon.png
--- a/data/icons/128x128-tomahawk-white-icon.png
+++ b/data/icons/128x128-tomahawk-white-icon.png
--- a/data/icons/16x16-tomahawk-icon.png
+++ b/data/icons/16x16-tomahawk-icon.png
--- a/data/icons/256x256-tomahawk-icon.png
+++ b/data/icons/256x256-tomahawk-icon.png
--- a/data/icons/32x32-tomahawk-icon.png
+++ b/data/icons/32x32-tomahawk-icon.png
--- a/data/icons/512x512-tomahawk-icon.png
+++ b/data/icons/512x512-tomahawk-icon.png
--- a/data/icons/64x64-tomahawk-icon.png
+++ b/data/icons/64x64-tomahawk-icon.png
--- a/data/icons/tomahawk-icon-128x128-grayscale.png
+++ b/data/icons/tomahawk-icon-128x128-grayscale.png
--- a/data/icons/tomahawk-icon-128x128.png
+++ b/data/icons/tomahawk-icon-128x128.png
--- a/data/icons/tomahawk-icon-16x16.png
+++ b/data/icons/tomahawk-icon-16x16.png
--- a/data/icons/tomahawk-icon-256x256.png
+++ b/data/icons/tomahawk-icon-256x256.png
--- a/data/icons/tomahawk-icon-32x32.png
+++ b/data/icons/tomahawk-icon-32x32.png
--- a/Show More
+++ b/Show More