diff options
-rw-r--r-- | src/multimedia/multimedia.pro | 4 | ||||
-rw-r--r-- | src/plugins/android/jar/bundledjar.pro | 3 | ||||
-rw-r--r-- | src/plugins/android/jar/distributedjar.pro | 2 | ||||
-rw-r--r-- | src/plugins/android/jar/jar.pri | 14 | ||||
-rw-r--r-- | src/plugins/android/jar/jar.pro | 16 |
5 files changed, 25 insertions, 14 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 2a1c6afb5..12278f5eb 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -51,10 +51,14 @@ include(radio/radio.pri) include(recording/recording.pri) include(video/video.pri) +ANDROID_BUNDLED_JAR_DEPENDENCIES = \ + jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer ANDROID_JAR_DEPENDENCIES = \ jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer ANDROID_LIB_DEPENDENCIES = \ plugins/mediaservice/libandroidmediaplayer.so +MODULE_PLUGIN_TYPES = \ + mediaservice mac { LIBS += -framework AppKit -framework QuartzCore -framework QTKit diff --git a/src/plugins/android/jar/bundledjar.pro b/src/plugins/android/jar/bundledjar.pro new file mode 100644 index 000000000..cc76164a7 --- /dev/null +++ b/src/plugins/android/jar/bundledjar.pro @@ -0,0 +1,3 @@ +TARGET = QtMultimedia-bundled +CONFIG += bundled_jar_file +include(jar.pri) diff --git a/src/plugins/android/jar/distributedjar.pro b/src/plugins/android/jar/distributedjar.pro new file mode 100644 index 000000000..34724c197 --- /dev/null +++ b/src/plugins/android/jar/distributedjar.pro @@ -0,0 +1,2 @@ +TARGET = QtMultimedia +include(jar.pri) diff --git a/src/plugins/android/jar/jar.pri b/src/plugins/android/jar/jar.pri new file mode 100644 index 000000000..e6a3c63c2 --- /dev/null +++ b/src/plugins/android/jar/jar.pri @@ -0,0 +1,14 @@ +load(qt_build_paths) +CONFIG += java +DESTDIR = $$MODULE_BASE_OUTDIR/jar +API_VERSION = android-11 + +JAVACLASSPATH += $$PWD/src + +JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ + $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \ + $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/plugins/android/jar/jar.pro b/src/plugins/android/jar/jar.pro index 2fa203a4f..6a4fcd389 100644 --- a/src/plugins/android/jar/jar.pro +++ b/src/plugins/android/jar/jar.pro @@ -1,15 +1,3 @@ -load(qt_build_paths) -CONFIG += java -TARGET = QtMultimedia -DESTDIR = $$MODULE_BASE_OUTDIR/jar -API_VERSION = android-11 +TEMPLATE=subdirs +SUBDIRS += distributedjar.pro bundledjar.pro -JAVACLASSPATH += $$PWD/src - -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target |