diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /src/plugins/platforms/eglfs/qeglfsscreen.cpp | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'src/plugins/platforms/eglfs/qeglfsscreen.cpp')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsscreen.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/qeglfsscreen.cpp index e104bd7f2b..6cb1f88c66 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() |