aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/plugins/General/scrobbler/scrobbler.h1
-rw-r--r--src/qmmp/qmmp.cpp2
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