diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index 6fedd6ac2ee580f77184ef7927a37edef2be5958..fd0c6b14e374196fc6e6343e3a56de4f4d7649d5 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -478,7 +478,6 @@ public class QtActivity extends Activity } loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList); loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES - + "QT_QPA_EGLFS_HIDECURSOR=1" + "\tQML2_IMPORT_PATH=" + localPrefix + "/qml" + "\tQML_IMPORT_PATH=" + localPrefix + "/imports" + "\tQT_PLUGIN_PATH=" + localPrefix + "/plugins"); diff --git a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp index 005758d83ddbd830187f9de679306f534baf1c41..5a35310111394e5171999f2264c68531692eac85 100644 --- a/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp +++ b/src/plugins/platforms/android/src/opengl/qeglfshooks_android.cpp @@ -62,6 +62,7 @@ public: EGLNativeWindowType createNativeWindow(const QSize &size, const QSurfaceFormat &format); void destroyNativeWindow(EGLNativeWindowType window); bool hasCapability(QPlatformIntegration::Capability cap) const; + QEglFSCursor *createCursor(QEglFSScreen *screen) const; }; void QEglFSAndroidHooks::platformInit() @@ -134,6 +135,12 @@ QSurfaceFormat QEglFSAndroidHooks::surfaceFormatFor(const QSurfaceFormat &inputF return ret; } +QEglFSCursor *QEglFSAndroidHooks::createCursor(QEglFSScreen *screen) const +{ + Q_UNUSED(screen); + return 0; +} + static QEglFSAndroidHooks eglFSAndroidHooks; QEglFSHooks *platformHooks = &eglFSAndroidHooks; diff --git a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp index 5c264834b393a0b24c8bfeef2ed4542c61e4dd25..91a97ff977fb9a937c4f002704747b7b79ca02ef 100644 --- a/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp +++ b/src/plugins/platforms/eglfs/qeglfshooks_stub.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qeglfshooks.h" +#include "qeglfscursor.h" #include <fcntl.h> #include <unistd.h> @@ -249,8 +250,7 @@ bool QEglFSHooks::hasCapability(QPlatformIntegration::Capability cap) const QEglFSCursor *QEglFSHooks::createCursor(QEglFSScreen *screen) const { - Q_UNUSED(screen); - return 0; + return new QEglFSCursor(screen); } void QEglFSHooks::waitForVSync() const diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp index e104bd7f2b28797dcbb6ddfd0e3db8b5e8e44327..6cb1f88c66460f7c4f14935a66f11a698a6277cd 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.cpp +++ b/src/plugins/platforms/eglfs/qeglfsscreen.cpp @@ -55,12 +55,8 @@ QEglFSScreen::QEglFSScreen(EGLDisplay dpy) #endif static int hideCursor = qgetenv("QT_QPA_EGLFS_HIDECURSOR").toInt(); - if (!hideCursor) { - if (QEglFSCursor *customCursor = QEglFSHooks::hooks()->createCursor(this)) - m_cursor = customCursor; - else - m_cursor = new QEglFSCursor(this); - } + if (!hideCursor) + m_cursor = QEglFSHooks::hooks()->createCursor(this); } QEglFSScreen::~QEglFSScreen()