Blackberry: Refactor plugin directory structure

Move the mediaplayer related code in its own subdirectory.
This is a preparation for adding camera support in the future.

Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

16 files changed, 30 insertions, 29 deletions

diff --git a/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp b/src/plugins/blackberry/bbserviceplugin.cpp
index 92dc4aee4..92dc4aee4 100644
--- a/src/plugins/blackberry/mediaservice/bbserviceplugin.cpp
+++ b/src/plugins/blackberry/bbserviceplugin.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbserviceplugin.h b/src/plugins/blackberry/bbserviceplugin.h
index dbf507f10..dbf507f10 100644
--- a/src/plugins/blackberry/mediaservice/bbserviceplugin.h
+++ b/src/plugins/blackberry/bbserviceplugin.h
diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro
index a03476523..ef414d7eb 100644
--- a/src/plugins/blackberry/blackberry.pro
+++ b/src/plugins/blackberry/blackberry.pro
@@ -1,5 +1,15 @@
-TEMPLATE = subdirs
+TARGET = qtmedia_blackberry
+QT += multimedia-private gui-private
 
-SUBDIRS += \
-    mediaservice
+PLUGIN_TYPE=mediaservice
+PLUGIN_CLASS_NAME = BbServicePlugin
+load(qt_plugin)
 
+LIBS += -lscreen
+
+HEADERS += bbserviceplugin.h
+SOURCES += bbserviceplugin.cpp
+
+include(mediaplayer/mediaplayer.pri)
+
+OTHER_FILES += blackberry_mediaservice.json
diff --git a/src/plugins/blackberry/mediaservice/blackberry_mediaservice.json b/src/plugins/blackberry/blackberry_mediaservice.json
index c4a27ea01..c4a27ea01 100644
--- a/src/plugins/blackberry/mediaservice/blackberry_mediaservice.json
+++ b/src/plugins/blackberry/blackberry_mediaservice.json
diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.cpp
index 41d3bc479..41d3bc479 100644
--- a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.h
index eb87ea872..eb87ea872 100644
--- a/src/plugins/blackberry/mediaservice/bbmediaplayercontrol.h
+++ b/src/plugins/blackberry/mediaplayer/bbmediaplayercontrol.h
diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.cpp
index 8730d2ddc..8730d2ddc 100644
--- a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.h
index 8ff52cd28..8ff52cd28 100644
--- a/src/plugins/blackberry/mediaservice/bbmediaplayerservice.h
+++ b/src/plugins/blackberry/mediaplayer/bbmediaplayerservice.h
diff --git a/src/plugins/blackberry/mediaservice/bbmetadata.cpp b/src/plugins/blackberry/mediaplayer/bbmetadata.cpp
index b34b63e72..b34b63e72 100644
--- a/src/plugins/blackberry/mediaservice/bbmetadata.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbmetadata.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbmetadata.h b/src/plugins/blackberry/mediaplayer/bbmetadata.h
index a983a6af1..a983a6af1 100644
--- a/src/plugins/blackberry/mediaservice/bbmetadata.h
+++ b/src/plugins/blackberry/mediaplayer/bbmetadata.h
diff --git a/src/plugins/blackberry/mediaservice/bbutil.cpp b/src/plugins/blackberry/mediaplayer/bbutil.cpp
index f79bcb1ba..f79bcb1ba 100644
--- a/src/plugins/blackberry/mediaservice/bbutil.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbutil.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbutil.h b/src/plugins/blackberry/mediaplayer/bbutil.h
index 44fde4ed4..44fde4ed4 100644
--- a/src/plugins/blackberry/mediaservice/bbutil.h
+++ b/src/plugins/blackberry/mediaplayer/bbutil.h
diff --git a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.cpp
index 5668332d1..5668332d1 100644
--- a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.cpp
+++ b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.cpp
diff --git a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.h
index 81bf79682..81bf79682 100644
--- a/src/plugins/blackberry/mediaservice/bbvideowindowcontrol.h
+++ b/src/plugins/blackberry/mediaplayer/bbvideowindowcontrol.h
diff --git a/src/plugins/blackberry/mediaplayer/mediaplayer.pri b/src/plugins/blackberry/mediaplayer/mediaplayer.pri
new file mode 100644
index 000000000..cf888f655
--- /dev/null
+++ b/src/plugins/blackberry/mediaplayer/mediaplayer.pri
@@ -0,0 +1,17 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/bbmediaplayercontrol.h \
+    $$PWD/bbmediaplayerservice.h \
+    $$PWD/bbmetadata.h \
+    $$PWD/bbutil.h \
+    $$PWD/bbvideowindowcontrol.h
+
+SOURCES += \
+    $$PWD/bbmediaplayercontrol.cpp \
+    $$PWD/bbmediaplayerservice.cpp \
+    $$PWD/bbmetadata.cpp \
+    $$PWD/bbutil.cpp \
+    $$PWD/bbvideowindowcontrol.cpp
+
+LIBS += -lmmrndclient -lstrm
diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro
deleted file mode 100644
index ffaed4816..000000000
--- a/src/plugins/blackberry/mediaservice/mediaservice.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TARGET = qtmedia_blackberry
-QT += multimedia-private gui-private
-
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = BbServicePlugin
-load(qt_plugin)
-
-LIBS += -lmmrndclient -lstrm -lscreen
-
-HEADERS += \
-    bbserviceplugin.h \
-    bbmediaplayerservice.h \
-    bbmediaplayercontrol.h \
-    bbmetadata.h \
-    bbutil.h \
-    bbvideowindowcontrol.h
-
-SOURCES += \
-    bbserviceplugin.cpp \
-    bbmediaplayerservice.cpp \
-    bbmediaplayercontrol.cpp \
-    bbmetadata.cpp \
-    bbutil.cpp \
-    bbvideowindowcontrol.cpp
-
-OTHER_FILES += blackberry_mediaservice.json