Skip to content

Commit e2e67bd

Browse files
committed
added target defines for build flavours
made new functionality compatible to Qt4
1 parent 47d0ba5 commit e2e67bd

File tree

5 files changed

+25
-2
lines changed

5 files changed

+25
-2
lines changed

libkodimote/libkodimote.pro

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ contains(QT_VERSION, ^5\\..\\..*) {
33
DEFINES += QT5_BUILD
44
QT += quick qml
55
} else {
6+
DEFINES += QT4_BUILD
67
QT += declarative
78
}
89

@@ -14,6 +15,14 @@ ubuntu {
1415
DEFINES += UBUNTU
1516
}
1617

18+
maemo5 {
19+
DEFINES += MAEMO5
20+
}
21+
22+
contains(MEEGO_EDITION,harmattan) {
23+
DEFINES += HARMATTAN
24+
}
25+
1726
TARGET = kodimote
1827
TEMPLATE = lib
1928
CONFIG += staticlib

libkodimote/mpris2/mpriscontroller.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include "mpriscontroller.h"
2323

24-
#include <QGuiApplication>
2524
#include <QtDBus/QtDBus>
2625

2726
#include "mprisapplication.h"

libkodimote/mpris2/mpriscontroller.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#define MPRISCONTROLLER_H
2424

2525
#include <QObject>
26-
#include <QWindow>
2726

2827
#include "../protocolhandlers/protocolmanager.h"
2928
#include "../platformhelper.h"

libkodimote/protocolhandlers/protocolmanager.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121

2222
#include "protocolmanager.h"
2323

24+
#if defined(QT5_BUILD)
2425
#include <QUrlQuery>
26+
#elif defined(QT4_BUILD)
27+
#include <QUrl>
28+
#endif
2529

2630
#include "youtubeprotocolhandler.h"
2731
#include "nativeprotocolhandler.h"
@@ -60,6 +64,10 @@ void ProtocolManager::execute(const QUrl &url)
6064

6165
ProtocolHandler *handler = m_handlers[url.scheme()];
6266

67+
#if defined(QT5_BUILD)
6368
QUrlQuery query(url);
69+
#elif defined(QT4_BUILD)
70+
QUrl query = url;
71+
#endif
6472
handler->execute(url, query.hasQueryItem("queue"));
6573
}

libkodimote/protocolhandlers/youtubeprotocolhandler.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121

2222
#include "youtubeprotocolhandler.h"
2323

24+
#if defined(QT5_BUILD)
2425
#include <QUrlQuery>
26+
#elif defined(QT4_BUILD)
27+
#include <QUrl>
28+
#endif
2529
#include "kodi.h"
2630
#include "videoplayer.h"
2731
#include "playlist.h"
@@ -39,7 +43,11 @@ QString YoutubeProtocolHandler::scheme() const
3943
void YoutubeProtocolHandler::execute(const QUrl &uri, bool queue)
4044
{
4145
QStringList parts = uri.path().split('/');
46+
#if defined(QT5_BUILD)
4247
QUrlQuery query;
48+
#elif defined(QT4_BUILD)
49+
QUrl query;
50+
#endif
4351
if (parts.length() == 1) {
4452
query.addQueryItem("action", "play_video");
4553
query.addQueryItem("videoid", parts[0]);

0 commit comments

Comments
 (0)