Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-18 20:34:39 +01:00
Code Issues Releases Wiki Activity

Only check subversion info if $BUILDBOT_REVISION not set.

Browse Source 
Fix compile warning.
This commit is contained in:
John Maguire 2010-11-25 17:14:11 +00:00
parent 8ac4e57cdf
commit b2ffc58070
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/Version.cmake
View File

@ -7,13 +7,14 @@ set(CLEMENTINE_VERSION_PATCH 3)
include(FindSubversion) include(FindSubversion)
find_package(Subversion) set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION})
if(SUBVERSION_FOUND) if(NOT BUILDBOT_REVISION)
Subversion_WC_INFO(${PROJECT_SOURCE_DIR} clementine) find_package(Subversion)
set(BUILDBOT_REVISION ${clementine_WC_REVISION}) if(SUBVERSION_FOUND)
else(SUBVERSION_FOUND) Subversion_WC_INFO(${PROJECT_SOURCE_DIR} clementine)
set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION}) set(BUILDBOT_REVISION ${clementine_WC_REVISION})
endif(SUBVERSION_FOUND) endif(SUBVERSION_FOUND)
endif(NOT BUILDBOT_REVISION)
if(BUILDBOT_REVISION) if(BUILDBOT_REVISION)
set(CLEMENTINE_VERSION_STRING "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR} r${BUILDBOT_REVISION}") # Displayed in GUIs set(CLEMENTINE_VERSION_STRING "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR} r${BUILDBOT_REVISION}") # Displayed in GUIs

2
src/radio/jamendoservice.cpp
View File

@ -280,8 +280,6 @@ Song JamendoService::ReadTrack(const QString& artist,
} }
void JamendoService::ParseDirectoryFinished() { void JamendoService::ParseDirectoryFinished() {
QFutureWatcher<void>* watcher = static_cast<QFutureWatcher<void>*>(sender());
model()->task_manager()->SetTaskFinished(load_database_task_id_); model()->task_manager()->SetTaskFinished(load_database_task_id_);
load_database_task_id_ = 0; load_database_task_id_ = 0;
} }