small cleanup for version

This commit is contained in:
Patrick von Reth 2013-07-07 10:19:23 +02:00
parent adb81b0fe9
commit 8a29bd339e
2 changed files with 6 additions and 10 deletions

View File

@ -5,7 +5,7 @@ include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC SNORE_REVISION)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
add_subdirectory(notification)
add_subdirectory(plugins)

View File

@ -1,29 +1,25 @@
#include "version.h"
#define SNORE_VERSION_MAJOR "@SNORE_VERSION_MAJOR@"
#define SNORE_VERSION_MINOR "@SNORE_VERSION_MINOR@"
#define SNORE_VERSION_SUFFIX "@SNORE_VERSION_SUFFIX@"
#define SNORE_REVISION "@SNORE_REVISION@"
namespace Snore{
const QString Version::version()
{
return QString("%1.%2%3").arg(major(),minor(),suffix());
return QLatin1String("${SNORE_VERSION_MAJOR}.${SNORE_VERSION_MINOR}${SNORE_VERSION_SUFFIX}");
}
const QString Version::major(){
return QString(SNORE_VERSION_MAJOR);
return QLatin1String("${SNORE_VERSION_MAJOR}");
}
const QString Version::minor(){
return QString(SNORE_VERSION_MINOR);
return QLatin1String("${SNORE_VERSION_MINOR}");
}
const QString Version::suffix(){
return QString(SNORE_VERSION_SUFFIX);
return QLatin1String("${SNORE_VERSION_SUFFIX}");
}
const QString Version::revision(){
return QString(SNORE_REVISION);
return QLatin1String("${SNORE_REVISION}");
}
}