diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffca1009e0..d649c981df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,277 +1,280 @@
 cmake_minimum_required(VERSION 3.4)
 
 project(Amarok)
 
 # Remove all warnings, ease the porting to cmake 3.x
 if (POLICY CMP0028)
     cmake_policy(SET CMP0028 NEW)
 endif()
 
 ###############
 find_package(PkgConfig REQUIRED)
 find_package(ECM 1.7.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMAddTests)
 include(ECMAddAppIcon)
 include(FindPkgConfig)
 
 find_package( Qt5 5.8.0 COMPONENTS QuickControls2 WebEngine )
 set_package_properties( Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" )
 
 find_package( Qt5 5.8.0 REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml )
 set_package_properties( Qt5WebEngine PROPERTIES TYPE OPTIONAL PURPOSE "Needed by the wikipedia applet" )
 
 find_package( KF5 REQUIRED COMPONENTS Archive Codecs CoreAddons DBusAddons Declarative DNSSD GlobalAccel GuiAddons I18n IconThemes KCMUtils KIO NewStuff Notifications NotifyConfig Package Solid TextEditor ThreadWeaver WindowSystem )
 
 find_package( KF5 COMPONENTS Kirigami2 )
 set_package_properties( KF5Kirigami2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area" )
 
 ###############
 option(WITH_UTILITIES "Enable building of utilities" ON)
 option(WITH_PLAYER "Enable building of main Amarok player" ON)
 option(WITH_MP3Tunes "Enable mp3tunes in the Amarok player, requires multiple extra dependencies" ON)
 option(WITH_IPOD "Enable iPod support in Amarok" ON)
 option(WITH_MYSQL_EMBEDDED "Build the embedded database library -- highly recommended" ON)
 option(WITH_PLAYGROUND "Enable building of playground scripts and applets (WARNING: some of them might have legal issues!)" OFF)
+option(WITH_TESTS "Enable compilation of unit tests" OFF)
 
 ############### Taglib
 set(TAGLIB_MIN_VERSION "1.7")
 find_package(Taglib REQUIRED)
 set_package_properties( Taglib PROPERTIES DESCRIPTION "Support for Audio metadata." URL "http://developer.kde.org/~wheeler/taglib.html" TYPE REQUIRED PURPOSE "Required for tag reading" )
 
 # Check if TagLib is built with ASF and MP4 support
 include(CheckCXXSourceCompiles)
 set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDES}")
 set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}")
 
 check_cxx_source_compiles("#include <asftag.h>
 int main() { TagLib::ASF::Tag tag; return 0;}" TAGLIB_ASF_FOUND)
 if( NOT TAGLIB_ASF_FOUND )
     message(FATAL_ERROR "TagLib does not have ASF support compiled in.")
 endif()
 
 check_cxx_source_compiles("#include <mp4tag.h>
 int main() { TagLib::MP4::Tag tag(0, 0); return 0;}" TAGLIB_MP4_FOUND)
 if( NOT TAGLIB_MP4_FOUND )
     message(FATAL_ERROR "TagLib does not have MP4 support compiled in.")
 endif()
 
 check_cxx_source_compiles("#include <modtag.h>
 #include <modfile.h>
 #include <s3mfile.h>
 #include <itfile.h>
 #include <xmfile.h>
 using namespace TagLib;
 int main() { char *s; Mod::Tag tag; Mod::File modfile(s); S3M::File s3mfile(s);
 IT::File itfile(s); XM::File xmfile(s); return 0; }" TAGLIB_MOD_FOUND)
 
 check_cxx_source_compiles("#include <opusfile.h>
 int main() { char *s; TagLib::Ogg::Opus::File opusfile(s); return 0;}" TAGLIB_OPUS_FOUND)
 
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
 
 set(TAGLIB-EXTRAS_MIN_VERSION "1.0")
 find_package(Taglib-Extras)
 set(TAGLIB_EXTRAS_FOUND ${TAGLIB-EXTRAS_FOUND}) # we need a c-compatible name for the include file
 
 include(CheckTagLibFileName)
 
 check_taglib_filename(COMPLEX_TAGLIB_FILENAME)
 ###############
 
 
 #Needed to conditionally build tests and gui
+set(BUILD_TESTING "${WITH_TESTS}")
+
 if(BUILD_TESTING)
    add_definitions(-DDEBUG)
 endif()
 
 if(WITH_DESKTOP_UI)
     add_definitions(-DDESKTOP_UI)
 endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
 if (CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
     if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed")
     endif()
 endif ()
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/shared
     ${CMAKE_CURRENT_BINARY_DIR}/shared
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")  # Require C++11
 
 # WORKAROUND for Clang bug: http://llvm.org/bugs/show_bug.cgi?id=15651
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-delayed-template-parsing")
 endif ()
 
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 find_package(Phonon4Qt5 4.6.60 REQUIRED NO_MODULE)
 
 find_package( LibLastFm )
 set( LIBLASTFM_MIN_VERSION "1.0.0" )
 if( LIBLASTFM_FOUND )
     if ( ${LIBLASTFM_MIN_VERSION} VERSION_LESS ${LIBLASTFM_VERSION} )
         set( LIBLASTFM_FOUND TRUE )
     endif()
 endif()
 
 string( TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER )
 if( CMAKE_BUILD_TYPE_TOLOWER MATCHES debug )
     set( DEBUG_BUILD_TYPE ON )
     add_definitions(-Wall -Wextra)
 endif()
 
 # this needs to be here because also code in shared/ needs config.h. This is also the
 # reason why various checks are above why they belong under if( WITH_PLAYER )
 configure_file( shared/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/shared/config.h )
 
 add_subdirectory( data )
 add_subdirectory( images )
 add_subdirectory( shared )
 
 if( WITH_PLAYER )
     find_package(X11)
     find_package(Threads REQUIRED)
 
     find_package(MySQL REQUIRED)
     if( WITH_MYSQL_EMBEDDED )
         set( BUILD_MYSQLE_COLLECTION TRUE )
         set_package_properties( MYSQLD PROPERTIES DESCRIPTION "Embedded MySQL Libraries" URL "http://www.mysql.com" TYPE REQUIRED )
     else()
         add_definitions( "-DNO_MYSQL_EMBEDDED" )
     endif()
     set_package_properties( MYSQL PROPERTIES DESCRIPTION "MySQL Server Libraries" URL "http://www.mysql.com" TYPE REQUIRED )
 
     # zlib is required for mysql embedded
     find_package(ZLIB REQUIRED)
     set_package_properties( ZLIB PROPERTIES DESCRIPTION "zlib" TYPE REQUIRED )
 
     # We tell users that we need 1.0.3, but we really check just >= 1.0.0. This is because
     # upstream forgot to update version in lastfm/global.h, so it looks like 1.0.2. :-(
     # will be fixed in liblastfm-1.0.4
     set( LIBLASTFM_MIN_VERSION "1.0.3" )
     set_package_properties( LibLastFm PROPERTIES DESCRIPTION "Enable Last.Fm service, including scrobbling, song submissions, and suggested song dynamic playlists" URL "http://cdn.last.fm/client/liblastfm-${LIBLASTFM_MIN_VERSION}.tar.gz" TYPE OPTIONAL )
 
     find_package(FFmpeg)
     set_package_properties(FFmpeg PROPERTIES
         DESCRIPTION "Libraries and tools for handling multimedia data"
         URL "https://www.ffmpeg.org/"
         TYPE OPTIONAL
         PURPOSE "Enable MusicDNS service"
     )
 
     find_package(LibOFA)
     set_package_properties(LibOFA PROPERTIES
         DESCRIPTION "Open-source audio fingerprint by MusicIP"
         URL "http://code.google.com/p/musicip-libofa/"
         TYPE OPTIONAL
         PURPOSE "Enable MusicDNS service"
     )
 
     ## gpodder Service
     find_package(Mygpo-qt5 1.1.0 CONFIG)
     set_package_properties(Mygpo-qt5 PROPERTIES
         DESCRIPTION "A Qt/C++ library wrapping the gpodder.net Webservice."
         URL "http://wiki.gpodder.org/wiki/Libmygpo-qt"
         TYPE OPTIONAL
         PURPOSE "Synchronize podcast subscriptions with gpodder.net"
     )
 
     if( WITH_IPOD )
         find_package(Ipod)
         set(IPOD_MIN_VERSION "0.8.2")
         if( IPOD_FOUND AND NOT WIN32 )
             if ( ${IPOD_MIN_VERSION} VERSION_LESS ${IPOD_VERSION} )
                 set( IPOD_FOUND TRUE )
             endif()
         endif()
         set_package_properties( Ipod PROPERTIES DESCRIPTION "Support Apple iPod/iPad/iPhone audio devices" URL "http://sourceforge.net/projects/gtkpod/" TYPE OPTIONAL )
         find_package(GDKPixBuf)
         set_package_properties( GDKPixBuf PROPERTIES DESCRIPTION "Support for artwork on iPod audio devices via GDK-PixBuf" URL "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" TYPE OPTIONAL )
     endif()
 
     find_package(Mtp 1.0.0)
     set_package_properties(Mtp PROPERTIES
         TYPE OPTIONAL
         PURPOSE "Enable Support for portable media devices that use the media transfer protocol"
     )
 
     if( WITH_MP3Tunes )
         find_package(CURL)
         set_package_properties( CURL PROPERTIES DESCRIPTION "Used to transfer data with URLs" URL "https://curl.haxx.se/" TYPE OPTIONAL )
 
         find_package(LibXml2)
         set_package_properties( LibXml2 PROPERTIES DESCRIPTION "LibXML2 is an XML parser required by mp3tunes." URL "http://www.xmlsoft.org" TYPE OPTIONAL )
 
         find_package(OpenSSL)
         find_package(Libgcrypt)
         if ( OPENSSL_FOUND OR LIBGCRYPT_FOUND )
             set (_mp3tunes_crypto TRUE )
         else ()
             message( SEND_ERROR "Building with mp3tunes support REQUIRES either OpenSSL or GNU Libgcrypt" )
         endif ()
         set_package_properties( OpenSSL PROPERTIES DESCRIPTION "OpenSSL or GNU Libgcrypt provides cryptographic functions required by mp3tunes." URL "http://www.openssl.org/ or http://www.gnupg.org/download/#libgcrypt" TYPE OPTIONAL )
         set_package_properties( Libgcrypt PROPERTIES DESCRIPTION "OpenSSL or GNU Libgcrypt provides cryptographic functions required by mp3tunes." URL "http://www.openssl.org/ or http://www.gnupg.org/download/#libgcrypt" TYPE OPTIONAL )
 
         find_package(Loudmouth)
         set_package_properties( Loudmouth PROPERTIES DESCRIPTION "Loudmouth is the communication backend needed by mp3tunes for syncing." URL "http://www.loudmouth-project.org" TYPE OPTIONAL )
 
         include(CheckQtGlib)
         set_package_properties( QT5_GLIB PROPERTIES DESCRIPTION "Qt5 must be compiled with glib support for mp3tunes" URL "http://www.trolltech.com" TYPE OPTIONAL )
     endif()
 
     if( WITH_IPOD OR WITH_MP3Tunes )
         pkg_search_module( GOBJECT REQUIRED gobject-2.0 )
         set_package_properties( GOBJECT PROPERTIES DESCRIPTION "Required by libgpod and mp3tunes." URL "http://www.gtk.org" TYPE OPTIONAL )
         pkg_search_module( GLIB2 glib-2.0 )
         set_package_properties( GLIB2 PROPERTIES DESCRIPTION "Required by libgpod and mp3tunes" URL "http://www.gtk.org" TYPE OPTIONAL )
     endif()
 
     find_program( CLAMZ_FOUND clamz PATH )
     set_package_properties( CLAMZ PROPERTIES DESCRIPTION "Optional requirement to download songs from the Amazon MP3 store. Highly recommended on Linux, as the official downloader from Amazon is quite broken on many systems." URL "https://code.google.com/p/clamz/" TYPE OPTIONAL )
 
     find_package(PythonInterp)
     set_package_properties( PYTHON PROPERTIES DESCRIPTION "Required for generating the autocompletion file for the script console" URL "https://www.python.org" TYPE OPTIONAL )
 
     find_package(FFTW3 REQUIRED)
 
     if( BUILD_TESTING AND NOT WIN32 )
         enable_testing()
         add_subdirectory( tests )
     endif()
 
     add_subdirectory( src )
 
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
     #Do not remove or modify these.  The release script substitutes in for these
     #comments with appropriate doc and translation directories.
     #PO_SUBDIR
     #DOC_SUBDIR
 
 endif()
 
 if( WITH_UTILITIES )
     add_subdirectory( utilities )
 endif()
 
 if( WITH_PLAYGROUND )
     add_subdirectory( playground )
     message(STATUS "Included playground subdirectory in configuration")
 endif()
 
 include(CTest)
diff --git a/HACKING/building_amarok2_in_home.txt b/HACKING/building_amarok2_in_home.txt
index 01ab5a7954..10bedece85 100644
--- a/HACKING/building_amarok2_in_home.txt
+++ b/HACKING/building_amarok2_in_home.txt
@@ -1,92 +1,92 @@
 This document explains how to install Amarok 2 from git in your home directory - in an easy way :)
 ==================================================================================================
 
 A detailed blog post on how to make a local build can be found here: http://blogs.fsfe.org/myriam/2009/09/26/compiling-amarok-from-git-locally-full-summary/
 
 * If you already have Amarok installed from your distro, uninstall it to prevent setting conflicts and similar.
 
 * Install git, the compiler and KDE 4 development packages:
 
   In Kubuntu, Debian, and all their derivatives:
     sudo aptitude install git-core build-essential kdesdk kdelibs5-dev libkonq5-dev kdebase-workspace-dev 
 
   In Archlinux:
     sudo pacman -Sy git base-devel kdelibs kdebase-runtime
 
   In Gentoo:
     sudo emerge -av dev-util/git kdelibs plasma-workspace
 
   In OpenSuSE:
     sudo zypper install git
 
   In Fedora:
     sudo yum install git kdelibs-devel
 
 
 *  Install ccache to speed up compilation
     ccache -M 2G
 
 * Append the following to $HOME/.bashrc:
     export PATH=$HOME/kde/bin:$PATH
     export KDEDIR=$HOME/kde
     export KDEDIRS=$KDEDIR
 
 * Reload your edited .bashrc:
     source $HOME/.bashrc
 
     NOTE: if you are not using the bash shell, edit your proper shell config file (~/.zshrc or ~/.tcshrc or whatever it may be)
 
 * Make KDE aware of Amarok's plugin location:
     echo 'export KDEDIR=$HOME/kde' >> $HOME/.kde/env/myenv.sh
     echo 'export KDEDIRS=$KDEDIR' >> $HOME/.kde/env/myenv.sh
 
   Some distributions call the above folder $HOME/.kde4/... (OpenSuSE in particular).
 
 * Create folders:
     mkdir $HOME/kde
     mkdir $HOME/kde/src
     mkdir -p $HOME/kde/build/amarok
 
 * Make sure you have all necessary dependencies
     See the README file for the complete list of necessary dependencies. Make sure you have the development files of these packages.
     For distribution specific requirements refer to http://community.kde.org/Amarok/Development/Development_HowTo
     
 * Check out Amarok:
     cd $HOME/kde/src
     git clone git://anongit.kde.org/amarok
 
 * Building:
     cd $HOME/kde/build/amarok
     cmake -DCMAKE_INSTALL_PREFIX=$HOME/kde -DCMAKE_BUILD_TYPE=debugfull $HOME/kde/src/amarok
     make install
 
 * Enabling unit tests:
 
   If you are a regular Amarok contributor, please build with tests enabled. 
   
   Install gmock from http://code.google.com/p/googlemock/
-  Add the following flag to your cmake line: -DKDE4_BUILD_TESTS=ON
+  Add the following flag to your cmake line: -DWITH_TESTS=ON
 
   Once compiled, jsut run the tests with 'make test'
   
   For more information about the test infrastructure, read the Qtestlib Manual: http://doc.trolltech.com/4.5/qtestlib-manual.html
 
 * Updating KDE Config:
     kbuildsycoca4 --noincremental
 
 
 Now you are ready to run Amarok 2, by typing "amarok" in the shell :)
 
 Please also refer to the following wiki page
     http://techbase.kde.org/Getting_Started/Sources/KDE_git-tutorial
 
 NOTE:
 If you have installed MySQL Embedded in non-default location (i.e. $HOME/usr),
 Amarok may fail to start with error regarding libmysqlclient library. In this
 case, add the following string to your ~/.bashrc:
     export LD_LIBRARY_PATH=$HOME/usr/lib/mysql:$LD_LIBRARY_PATH
 
 where $HOME/usr is the path you've used in --prefix option.
 
 
 Have fun :)