diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-02-21 17:09:39 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-02-21 17:09:39 +0000 |
| commit | a8e60d56bb63b9f14b906f089262d99f39471565 (patch) | |
| tree | ecd101ddeba9dd79a99848a2ccbc73a392353063 | |
| parent | a3392efb1e2ecb3ac8c102c4932c19c59f82d7b2 (diff) | |
| download | qmmp-a8e60d56bb63b9f14b906f089262d99f39471565.tar.gz qmmp-a8e60d56bb63b9f14b906f089262d99f39471565.tar.bz2 qmmp-a8e60d56bb63b9f14b906f089262d99f39471565.zip | |
fixed build
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2633 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/General/scrobbler/scrobbler.h | 1 | ||||
| -rw-r--r-- | src/qmmp/qmmp.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cdbf93fce..4d2b9d62c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 2.6.0) -SET(SVN_VERSION TRUE) - #extract version from qmmp.h FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") diff --git a/src/plugins/General/scrobbler/scrobbler.h b/src/plugins/General/scrobbler/scrobbler.h index 5a829ddb2..7d0d3f610 100644 --- a/src/plugins/General/scrobbler/scrobbler.h +++ b/src/plugins/General/scrobbler/scrobbler.h @@ -21,6 +21,7 @@ #define SCROBBLER_H #include <QMap> +#include <QObject> #include <qmmp/qmmp.h> class QNetworkAccessManager; diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index 091729074..541ba2eb0 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -48,7 +48,7 @@ const QString Qmmp::strVersion() .arg(QMMP_VERSION_MAJOR) .arg(QMMP_VERSION_MINOR) .arg(QMMP_VERSION_PATCH); -#if !QMMP_VERSION_STABLE && SVN_REVISION +#if !QMMP_VERSION_STABLE #ifdef SVN_REVISION ver += "-"SVN_REVISION; #else |