diff options
Diffstat (limited to 'src/plugins/android/src')
6 files changed, 10 insertions, 10 deletions
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) |