diff --git a/CMakeModules/FindQtSparkle.cmake b/CMakeModules/FindQtSparkle.cmake index f29d53713..8cdee222b 100644 --- a/CMakeModules/FindQtSparkle.cmake +++ b/CMakeModules/FindQtSparkle.cmake @@ -5,13 +5,19 @@ # QTSPARKLE_LIBRARY, the path to qtsparkle # 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 ${CMAKE_INSTALL_INCLUDEDIR} ${KDE4_INCLUDE_DIR} ) -FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle +FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle${QTSPARKLE_SUFFIX} HINTS ${CMAKE_INSTALL_LIBDIR} ${KDE4_LIB_DIR} diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 806548b9d..832d8c7dd 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -89,7 +89,11 @@ #if defined( Q_OS_WIN ) #if defined ( WITH_QtSparkle ) - #include + #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) + #include + #else + #include + #endif #endif #include #if QT_VERSION < QT_VERSION_CHECK(5,2,0)