diff --git a/ChangeLog b/ChangeLog index 745f3dd6d..979bf8385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ 1.4.1 ----- 1. Remove unused var warning when compiling without online services. +2. Remove some moc/QObject warnings in KDE builds without streams or http + server. 1.4.0 ----- diff --git a/http/httpserver.h b/http/httpserver.h index 2bfe7c280..8e487cf3e 100644 --- a/http/httpserver.h +++ b/http/httpserver.h @@ -37,7 +37,7 @@ class QTimer; class HttpServer : public QObject { - #ifdef ENABLE_HTTP_SERVER + #if defined ENABLE_HTTP_SERVER || defined ENABLE_KDE_SUPPORT Q_OBJECT #endif diff --git a/models/streamsmodel.h b/models/streamsmodel.h index 8a78e013e..fefb7da26 100644 --- a/models/streamsmodel.h +++ b/models/streamsmodel.h @@ -332,6 +332,17 @@ private: QList hiddenCategories; }; +#elif defined ENABLE_KDE_SUPPORT +#include +class StreamsModel : public QObject +{ + Q_OBJECT +public: + static const QString constPrefix; + static const QString constPlayListName; + static QString modifyUrl(const QString &u, bool addPrefix=true, const QString &name=QString()); + static bool validProtocol(const QString &file); +}; #else namespace StreamsModel {