Revert "Revert "qt4: Updated to v4.7.3"
[openembedded.git] / recipes / qt4 / qt4-embedded-gles-4.6.3 / cursor-hack.diff
1 Patch originally done by Bin Liu, rediffed by Koen Kooi for Qt 4.6.2
2
3 This patch is a first step to get a working cursor when using the powervr driver, it flickers when hovering over a QGLWidget, but still better than no cursor at all
4
5 --- /tmp/pvreglscreen.cpp       2010-04-19 09:30:32.000000000 +0200
6 +++ qt-everywhere-opensource-src-4.6.2/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp     2010-04-19 09:31:30.000000000 +0200
7 @@ -85,6 +85,9 @@
8  bool PvrEglScreen::initDevice()
9  {
10      openTty();
11 +#ifndef QT_NO_QWS_CURSOR
12 +    QScreenCursor::initSoftwareCursor();
13 +#endif
14      return true;
15  }
16  
17 --- /tmp/qwindowsystem_qws.cpp  2010-04-19 09:32:47.000000000 +0200
18 +++ qt-everywhere-opensource-src-4.6.2/src/gui/embedded/qwindowsystem_qws.cpp   2010-04-19 09:33:30.000000000 +0200
19 @@ -3501,7 +3501,6 @@
20          }
21  
22  #ifdef QT_QWS_CLIENTBLIT
23 -#ifdef QT_NO_QWS_CURSOR
24          // This optimization only really works when there isn't a crazy cursor
25          // wizzing around.
26          QRegion directPaint = (r - transparentRegion); // in gloal coords
27 @@ -3513,7 +3512,6 @@
28                                           QWSRegionEvent::DirectPaint, id);
29          }
30  #endif
31 -#endif
32      }
33  
34      if (doLock)