diff options
16 files changed, 27 insertions, 27 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 55fa9c5c4..10d49ef59 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -65,7 +65,7 @@ include(recording/recording.pri) include(video/video.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils + jar/Qt$${QT_MAJOR_VERSION}AndroidMultimedia.jar:org.qtproject.qt.android.multimedia.QtMultimediaUtils ANDROID_LIB_DEPENDENCIES = \ plugins/mediaservice/libplugins_mediaservice_qtmedia_android.so \ lib/libQt5MultimediaQuick.so:Qt5Quick diff --git a/src/plugins/android/jar/AndroidManifest.xml b/src/plugins/android/jar/AndroidManifest.xml index 7eae1854d..17019fb34 100644 --- a/src/plugins/android/jar/AndroidManifest.xml +++ b/src/plugins/android/jar/AndroidManifest.xml @@ -1,5 +1,5 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.qtproject.qt5.android.multimedia" + package="org.qtproject.qt.android.multimedia" android:versionCode="1" android:versionName="1.0" > <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> diff --git a/src/plugins/android/jar/jar.pro b/src/plugins/android/jar/jar.pro index 96e492f63..0ef830f32 100644 --- a/src/plugins/android/jar/jar.pro +++ b/src/plugins/android/jar/jar.pro @@ -1,4 +1,4 @@ -TARGET = QtMultimedia +TARGET = Qt$${QT_MAJOR_VERSION}AndroidMultimedia load(qt_build_paths) CONFIG += java @@ -6,13 +6,13 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar JAVACLASSPATH += $$PWD/src -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java \ - $$PWD/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java +JAVASOURCES += $$PWD/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtCameraListener.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java \ + $$PWD/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java # install target.path = $$[QT_INSTALL_PREFIX]/jar diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java index 5a0462338..aa706179c 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import java.io.IOException; import java.lang.String; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java index 49cb0a947..ff26d90c3 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtCameraListener.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.hardware.Camera; import android.graphics.ImageFormat; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java index 7409ea370..bf1763dee 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMediaRecorderListener.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMediaRecorderListener.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.media.MediaRecorder; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java index f88a45359..28d56e0dd 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtMultimediaUtils.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.app.Activity; import android.content.Context; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java index e6fc9b5a1..62000716b 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.view.SurfaceHolder; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java index c9ff3bd1c..ea7a41505 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.view.SurfaceHolder; import android.view.Surface; diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java index a997dde90..4d929c6ad 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java +++ b/src/plugins/android/jar/src/org/qtproject/qt/android/multimedia/QtSurfaceTextureListener.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.multimedia; +package org.qtproject.qt.android.multimedia; import android.graphics.SurfaceTexture; diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 3ea7bc773..33e819d78 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -static const char QtCameraListenerClassName[] = "org/qtproject/qt5/android/multimedia/QtCameraListener"; +static const char QtCameraListenerClassName[] = "org/qtproject/qt/android/multimedia/QtCameraListener"; typedef QHash<int, AndroidCamera *> CameraMap; Q_GLOBAL_STATIC(CameraMap, cameras) diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp index 0018a250c..c94695de4 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp @@ -46,7 +46,7 @@ #include <QList> #include <QReadWriteLock> -static const char QtAndroidMediaPlayerClassName[] = "org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer"; +static const char QtAndroidMediaPlayerClassName[] = "org/qtproject/qt/android/multimedia/QtAndroidMediaPlayer"; typedef QList<AndroidMediaPlayer *> MediaPlayerList; Q_GLOBAL_STATIC(MediaPlayerList, mediaPlayers) Q_GLOBAL_STATIC(QReadWriteLock, rwLock) diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp b/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp index d607ab806..e5f8846b9 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp @@ -123,7 +123,7 @@ AndroidCamcorderProfile::AndroidCamcorderProfile(const QJNIObjectPrivate &camcor m_camcorderProfile = camcorderProfile; } -static const char QtMediaRecorderListenerClassName[] = "org/qtproject/qt5/android/multimedia/QtMediaRecorderListener"; +static const char QtMediaRecorderListenerClassName[] = "org/qtproject/qt/android/multimedia/QtMediaRecorderListener"; typedef QMap<jlong, AndroidMediaRecorder*> MediaRecorderMap; Q_GLOBAL_STATIC(MediaRecorderMap, mediaRecorders) diff --git a/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp b/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp index d5b2060d9..19dfbd7d2 100644 --- a/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmultimediautils.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE void AndroidMultimediaUtils::enableOrientationListener(bool enable) { - QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils", + QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt/android/multimedia/QtMultimediaUtils", "enableOrientationListener", "(Z)V", enable); @@ -54,13 +54,13 @@ void AndroidMultimediaUtils::enableOrientationListener(bool enable) int AndroidMultimediaUtils::getDeviceOrientation() { - return QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils", + return QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/multimedia/QtMultimediaUtils", "getDeviceOrientation"); } QString AndroidMultimediaUtils::getDefaultMediaDirectory(MediaType type) { - QJNIObjectPrivate path = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/multimedia/QtMultimediaUtils", + QJNIObjectPrivate path = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/multimedia/QtMultimediaUtils", "getDefaultMediaDirectory", "(I)Ljava/lang/String;", jint(type)); @@ -69,7 +69,7 @@ QString AndroidMultimediaUtils::getDefaultMediaDirectory(MediaType type) void AndroidMultimediaUtils::registerMediaFile(const QString &file) { - QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt5/android/multimedia/QtMultimediaUtils", + QJNIObjectPrivate::callStaticMethod<void>("org/qtproject/qt/android/multimedia/QtMultimediaUtils", "registerMediaFile", "(Ljava/lang/String;)V", QJNIObjectPrivate::fromString(file).object()); diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp index 966c2017c..c5b670142 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp +++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -static const char QtSurfaceTextureListenerClassName[] = "org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener"; +static const char QtSurfaceTextureListenerClassName[] = "org/qtproject/qt/android/multimedia/QtSurfaceTextureListener"; typedef QList<jlong> SurfaceTextures; Q_GLOBAL_STATIC(SurfaceTextures, g_surfaceTextures); Q_GLOBAL_STATIC(QMutex, g_textureMutex); @@ -155,7 +155,7 @@ jobject AndroidSurfaceTexture::surface() jobject AndroidSurfaceTexture::surfaceHolder() { if (!m_surfaceHolder.isValid()) { - m_surfaceHolder = QJNIObjectPrivate("org/qtproject/qt5/android/multimedia/QtSurfaceTextureHolder", + m_surfaceHolder = QJNIObjectPrivate("org/qtproject/qt/android/multimedia/QtSurfaceTextureHolder", "(Landroid/view/Surface;)V", surface()); } diff --git a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp index 3e8ad66e1..d7587f479 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp +++ b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -static const char QtSurfaceHolderCallbackClassName[] = "org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback"; +static const char QtSurfaceHolderCallbackClassName[] = "org/qtproject/qt/android/multimedia/QtSurfaceHolderCallback"; typedef QList<AndroidSurfaceHolder *> SurfaceHolders; Q_GLOBAL_STATIC(SurfaceHolders, surfaceHolders) Q_GLOBAL_STATIC(QMutex, shLock) |