mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

Use qtsparkle-qt5 when building with Qt5

Browse Source
This commit is contained in:
Dominik Schmidt
2015-01-28 20:25:31 +01:00
parent c4c4ab6681
commit 9b2a3f65d4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeModules/FindQtSparkle.cmake
View File

@@ -5,13 +5,19 @@
# QTSPARKLE_LIBRARY, the path to qtsparkle # QTSPARKLE_LIBRARY, the path to qtsparkle
# QTSPARKLE_FOUND, whether qtsparkle was found # QTSPARKLE_FOUND, whether qtsparkle was found
FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle/Updater if( TOMAHAWK_QT5 )
set(QTSPARKLE_SUFFIX "-qt5")
else()
set(QTSPARKLE_SUFFIX "")
endif()
FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle${QTSPARKLE_SUFFIX}/Updater
HINTS HINTS
${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_INSTALL_INCLUDEDIR}
${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}
) )
FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle${QTSPARKLE_SUFFIX}
HINTS HINTS
${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_LIBDIR}
${KDE4_LIB_DIR} ${KDE4_LIB_DIR}

6
src/tomahawk/TomahawkWindow.cpp
View File

@@ -89,7 +89,11 @@
#if defined( Q_OS_WIN ) #if defined( Q_OS_WIN )
#if defined ( WITH_QtSparkle ) #if defined ( WITH_QtSparkle )
#include <qtsparkle/Updater> #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 )
#include <qtsparkle/Updater>
#else
#include <qtsparkle-qt5/Updater>
#endif
#endif #endif
#include <shellapi.h> #include <shellapi.h>
#if QT_VERSION < QT_VERSION_CHECK(5,2,0) #if QT_VERSION < QT_VERSION_CHECK(5,2,0)