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 <thomas.mcguire@kdab.com>

15 files changed, 37 insertions, 32 deletions

diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro
index d5eb8dd04..a03476523 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
index 41d3bc479..41d3bc479 100644
--- a/src/plugins/blackberry/bbmediaplayercontrol.cpp
+++ b/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp
diff --git a/src/plugins/blackberry/bbmediaplayercontrol.h b/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h
index eb87ea872..eb87ea872 100644
--- a/src/plugins/blackberry/bbmediaplayercontrol.h
+++ b/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h
diff --git a/src/plugins/blackberry/bbmediaplayerservice.cpp b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp
index 8730d2ddc..8730d2ddc 100644
--- a/src/plugins/blackberry/bbmediaplayerservice.cpp
+++ b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp
diff --git a/src/plugins/blackberry/bbmediaplayerservice.h b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h
index 8ff52cd28..8ff52cd28 100644
--- a/src/plugins/blackberry/bbmediaplayerservice.h
+++ b/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h
diff --git a/src/plugins/blackberry/bbmetadata.cpp b/src/plugins/blackberry/mediaservice/bbmetadata.cpp
index b34b63e72..b34b63e72 100644
--- a/src/plugins/blackberry/bbmetadata.cpp
+++ b/src/plugins/blackberry/mediaservice/bbmetadata.cpp
diff --git a/src/plugins/blackberry/bbmetadata.h b/src/plugins/blackberry/mediaservice/bbmetadata.h
index a983a6af1..a983a6af1 100644
--- a/src/plugins/blackberry/bbmetadata.h
+++ b/src/plugins/blackberry/mediaservice/bbmetadata.h
diff --git a/src/plugins/blackberry/bbserviceplugin.cpp b/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp
index 92dc4aee4..92dc4aee4 100644
--- a/src/plugins/blackberry/bbserviceplugin.cpp
+++ b/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp
diff --git a/src/plugins/blackberry/bbserviceplugin.h b/src/plugins/blackberry/mediaservice/bbserviceplugin.h
index 8a0dd14fb..dbf507f10 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
index f79bcb1ba..f79bcb1ba 100644
--- a/src/plugins/blackberry/bbutil.cpp
+++ b/src/plugins/blackberry/mediaservice/bbutil.cpp
diff --git a/src/plugins/blackberry/bbutil.h b/src/plugins/blackberry/mediaservice/bbutil.h
index 44fde4ed4..44fde4ed4 100644
--- a/src/plugins/blackberry/bbutil.h
+++ b/src/plugins/blackberry/mediaservice/bbutil.h
diff --git a/src/plugins/blackberry/bbvideowindowcontrol.cpp b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp
index 5668332d1..5668332d1 100644
--- a/src/plugins/blackberry/bbvideowindowcontrol.cpp
+++ b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp
diff --git a/src/plugins/blackberry/bbvideowindowcontrol.h b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h
index 81bf79682..81bf79682 100644
--- a/src/plugins/blackberry/bbvideowindowcontrol.h
+++ b/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h
diff --git a/src/plugins/blackberry/blackberry.json b/src/plugins/blackberry/mediaservice/blackberry_mediaservice.json
index c4a27ea01..c4a27ea01 100644
--- a/src/plugins/blackberry/blackberry.json
+++ b/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 000000000..52a7f6556
--- /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