From c8c1affca2f6adfd4bb48c8bbb5c6262690e1f5a Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Fri, 4 Sep 2015 14:57:36 +0200 Subject: [PATCH] Only try to build with QtSparkle if it has been found. --- src/libtomahawk/Config.h.in | 2 +- src/tomahawk/TomahawkWindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/Config.h.in b/src/libtomahawk/Config.h.in index f3c180713..abe825b3f 100644 --- a/src/libtomahawk/Config.h.in +++ b/src/libtomahawk/Config.h.in @@ -15,12 +15,12 @@ #cmakedefine WITH_CRASHREPORTER #cmakedefine WITH_BINARY_ATTICA -#cmakedefine WITH_QtSparkle #cmakedefine WITH_UPOWER #cmakedefine WITH_GNOMESHORTCUTHANDLER #cmakedefine LIBLASTFM_FOUND #cmakedefine QCA2_FOUND +#cmakedefine QtSparkle_FOUND #cmakedefine TOMAHAWK_FINEGRAINED_MESSAGES #cmakedefine COMPLEX_TAGLIB_FILENAME diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 630319ceb..7513dee49 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -88,7 +88,7 @@ #include "config.h" #if defined( Q_OS_WIN ) - #if defined ( WITH_QtSparkle ) + #if defined ( QtSparkle_FOUND ) #if QT_VERSION < QT_VERSION_CHECK( 5, 0, 0 ) #include #else @@ -521,7 +521,7 @@ TomahawkWindow::setupUpdateCheck() #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) connect( ActionCollection::instance()->getAction( "checkForUpdates" ), SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); - #elif defined( Q_OS_WIN ) && defined( WITH_QtSparkle ) + #elif defined( Q_OS_WIN ) && defined( QtSparkle_FOUND ) QUrl updaterUrl; if ( qApp->arguments().contains( "--debug" ) )