From 690b4c4978bc050c31d8768578b5d78cbbc6c398 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 13 Aug 2012 16:39:09 +0200 Subject: [PATCH] Blackberry: Move the mediaservice plugin in a subdirectory Move the current platform plugin content in a subdir in order to make room for several plugins (at least an extra one will be needed for the audio type). Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48 Reviewed-by: Thomas McGuire --- src/plugins/blackberry/blackberry.pro | 34 ++----------------- .../bbmediaplayercontrol.cpp | 0 .../{ => mediaservice}/bbmediaplayercontrol.h | 0 .../bbmediaplayerservice.cpp | 0 .../{ => mediaservice}/bbmediaplayerservice.h | 0 .../{ => mediaservice}/bbmetadata.cpp | 0 .../{ => mediaservice}/bbmetadata.h | 0 .../{ => mediaservice}/bbserviceplugin.cpp | 0 .../{ => mediaservice}/bbserviceplugin.h | 2 +- .../blackberry/{ => mediaservice}/bbutil.cpp | 0 .../blackberry/{ => mediaservice}/bbutil.h | 0 .../bbvideowindowcontrol.cpp | 0 .../{ => mediaservice}/bbvideowindowcontrol.h | 0 .../blackberry_mediaservice.json} | 0 .../blackberry/mediaservice/mediaservice.pro | 33 ++++++++++++++++++ 15 files changed, 37 insertions(+), 32 deletions(-) rename src/plugins/blackberry/{ => mediaservice}/bbmediaplayercontrol.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbmediaplayercontrol.h (100%) rename src/plugins/blackberry/{ => mediaservice}/bbmediaplayerservice.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbmediaplayerservice.h (100%) rename src/plugins/blackberry/{ => mediaservice}/bbmetadata.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbmetadata.h (100%) rename src/plugins/blackberry/{ => mediaservice}/bbserviceplugin.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbserviceplugin.h (98%) rename src/plugins/blackberry/{ => mediaservice}/bbutil.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbutil.h (100%) rename src/plugins/blackberry/{ => mediaservice}/bbvideowindowcontrol.cpp (100%) rename src/plugins/blackberry/{ => mediaservice}/bbvideowindowcontrol.h (100%) rename src/plugins/blackberry/{blackberry.json => mediaservice/blackberry_mediaservice.json} (100%) create mode 100644 src/plugins/blackberry/mediaservice/mediaservice.pro diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro index d5eb8dd0..a0347652 100644 --- a/src/plugins/blackberry/blackberry.pro +++ b/src/plugins/blackberry/blackberry.pro @@ -1,33 +1,5 @@ -TARGET = qtmedia_blackberry -QT += multimedia-private gui-private -CONFIG += no_private_qt_headers_warning +TEMPLATE = subdirs -PLUGIN_TYPE=mediaservice +SUBDIRS += \ + mediaservice -load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} -LIBS += -lmmrndclient -lstrm -lscreen - -HEADERS += \ - bbserviceplugin.h \ - bbmediaplayerservice.h \ - bbmediaplayercontrol.h \ - bbmetadata.h \ - bbutil.h - -SOURCES += \ - bbserviceplugin.cpp \ - bbmediaplayerservice.cpp \ - bbmediaplayercontrol.cpp \ - bbmetadata.cpp \ - bbutil.cpp - -!isEmpty(QT.widgets.name) { - HEADERS += bbvideowindowcontrol.h - SOURCES += bbvideowindowcontrol.cpp -} - -OTHER_FILES += blackberry.json - -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target diff --git a/src/plugins/blackberry/bbmediaplayercontrol.cpp b/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp similarity index 100% rename from src/plugins/blackberry/bbmediaplayercontrol.cpp rename to src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp diff --git a/src/plugins/blackberry/bbmediaplayercontrol.h b/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h similarity index 100% rename from src/plugins/blackberry/bbmediaplayercontrol.h rename to src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h diff --git a/src/plugins/blackberry/bbmediaplayerservice.cpp b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp similarity index 100% rename from src/plugins/blackberry/bbmediaplayerservice.cpp rename to src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp diff --git a/src/plugins/blackberry/bbmediaplayerservice.h b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h similarity index 100% rename from src/plugins/blackberry/bbmediaplayerservice.h rename to src/plugins/blackberry/mediaservice/bbmediaplayerservice.h diff --git a/src/plugins/blackberry/bbmetadata.cpp b/src/plugins/blackberry/mediaservice/bbmetadata.cpp similarity index 100% rename from src/plugins/blackberry/bbmetadata.cpp rename to src/plugins/blackberry/mediaservice/bbmetadata.cpp diff --git a/src/plugins/blackberry/bbmetadata.h b/src/plugins/blackberry/mediaservice/bbmetadata.h similarity index 100% rename from src/plugins/blackberry/bbmetadata.h rename to src/plugins/blackberry/mediaservice/bbmetadata.h diff --git a/src/plugins/blackberry/bbserviceplugin.cpp b/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp similarity index 100% rename from src/plugins/blackberry/bbserviceplugin.cpp rename to src/plugins/blackberry/mediaservice/bbserviceplugin.cpp diff --git a/src/plugins/blackberry/bbserviceplugin.h b/src/plugins/blackberry/mediaservice/bbserviceplugin.h similarity index 98% rename from src/plugins/blackberry/bbserviceplugin.h rename to src/plugins/blackberry/mediaservice/bbserviceplugin.h index 8a0dd14f..dbf507f1 100644 --- a/src/plugins/blackberry/bbserviceplugin.h +++ b/src/plugins/blackberry/mediaservice/bbserviceplugin.h @@ -51,7 +51,7 @@ class BbServicePlugin { Q_OBJECT Q_INTERFACES(QMediaServiceFeaturesInterface) - Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "blackberry.json") + Q_PLUGIN_METADATA(IID "org.qt-project.qt.mediaserviceproviderfactory/5.0" FILE "blackberry_mediaservice.json") public: BbServicePlugin(); diff --git a/src/plugins/blackberry/bbutil.cpp b/src/plugins/blackberry/mediaservice/bbutil.cpp similarity index 100% rename from src/plugins/blackberry/bbutil.cpp rename to src/plugins/blackberry/mediaservice/bbutil.cpp diff --git a/src/plugins/blackberry/bbutil.h b/src/plugins/blackberry/mediaservice/bbutil.h similarity index 100% rename from src/plugins/blackberry/bbutil.h rename to src/plugins/blackberry/mediaservice/bbutil.h diff --git a/src/plugins/blackberry/bbvideowindowcontrol.cpp b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp similarity index 100% rename from src/plugins/blackberry/bbvideowindowcontrol.cpp rename to src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp diff --git a/src/plugins/blackberry/bbvideowindowcontrol.h b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h similarity index 100% rename from src/plugins/blackberry/bbvideowindowcontrol.h rename to src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h diff --git a/src/plugins/blackberry/blackberry.json b/src/plugins/blackberry/mediaservice/blackberry_mediaservice.json similarity index 100% rename from src/plugins/blackberry/blackberry.json rename to src/plugins/blackberry/mediaservice/blackberry_mediaservice.json diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro new file mode 100644 index 00000000..52a7f655 --- /dev/null +++ b/src/plugins/blackberry/mediaservice/mediaservice.pro @@ -0,0 +1,33 @@ +TARGET = qtmedia_blackberry +QT += multimedia-private gui-private +CONFIG += no_private_qt_headers_warning + +PLUGIN_TYPE=mediaservice + +load(qt_plugin) +DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} +LIBS += -lmmrndclient -lstrm -lscreen + +HEADERS += \ + bbserviceplugin.h \ + bbmediaplayerservice.h \ + bbmediaplayercontrol.h \ + bbmetadata.h \ + bbutil.h + +SOURCES += \ + bbserviceplugin.cpp \ + bbmediaplayerservice.cpp \ + bbmediaplayercontrol.cpp \ + bbmetadata.cpp \ + bbutil.cpp + +!isEmpty(QT.widgets.name) { + HEADERS += bbvideowindowcontrol.h + SOURCES += bbvideowindowcontrol.cpp +} + +OTHER_FILES += blackberry_mediaservice.json + +target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} +INSTALLS += target