diff options
Diffstat (limited to 'recipes/qt4')
-rw-r--r-- | recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff | 34 | ||||
-rw-r--r-- | recipes/qt4/qt4-embedded-gles/linux.conf | 2 | ||||
-rw-r--r-- | recipes/qt4/qt4-embedded-gles_4.6.2.bb | 5 | ||||
-rw-r--r-- | recipes/qt4/qt4-tools-native.inc | 22 | ||||
-rw-r--r-- | recipes/qt4/qt4-x11-free-gles/linux.conf | 2 | ||||
-rw-r--r-- | recipes/qt4/qt4-x11-free-gles_4.6.2.bb | 4 |
6 files changed, 52 insertions, 17 deletions
diff --git a/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff b/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff new file mode 100644 index 0000000000..e297e520a0 --- /dev/null +++ b/recipes/qt4/qt4-embedded-gles-4.6.2/cursor-hack.diff @@ -0,0 +1,34 @@ +Patch originally done by Bin Liu, rediffed by Koen Kooi for Qt 4.6.2 + +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 + +--- /tmp/pvreglscreen.cpp 2010-04-19 09:30:32.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.2/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp 2010-04-19 09:31:30.000000000 +0200 +@@ -85,6 +85,9 @@ + bool PvrEglScreen::initDevice() + { + openTty(); ++#ifndef QT_NO_QWS_CURSOR ++ QScreenCursor::initSoftwareCursor(); ++#endif + return true; + } + +--- /tmp/qwindowsystem_qws.cpp 2010-04-19 09:32:47.000000000 +0200 ++++ qt-everywhere-opensource-src-4.6.2/src/gui/embedded/qwindowsystem_qws.cpp 2010-04-19 09:33:30.000000000 +0200 +@@ -3501,7 +3501,6 @@ + } + + #ifdef QT_QWS_CLIENTBLIT +-#ifdef QT_NO_QWS_CURSOR + // This optimization only really works when there isn't a crazy cursor + // wizzing around. + QRegion directPaint = (r - transparentRegion); // in gloal coords +@@ -3513,7 +3512,6 @@ + QWSRegionEvent::DirectPaint, id); + } + #endif +-#endif + } + + if (doLock) diff --git a/recipes/qt4/qt4-embedded-gles/linux.conf b/recipes/qt4/qt4-embedded-gles/linux.conf index 8c099a6439..4394fbc5f7 100644 --- a/recipes/qt4/qt4-embedded-gles/linux.conf +++ b/recipes/qt4/qt4-embedded-gles/linux.conf @@ -61,6 +61,6 @@ QMAKE_INSTALL_FILE = install -m 644 -p QMAKE_INSTALL_PROGRAM = install -m 755 -p #These defines are documented in the powervr README, please read it -DEFINES += QT_NO_OPENVG QT_QWS_CLIENTBLIT QT_NO_QWS_CURSOR +DEFINES += QT_QWS_CLIENTBLIT include(unix.conf) diff --git a/recipes/qt4/qt4-embedded-gles_4.6.2.bb b/recipes/qt4/qt4-embedded-gles_4.6.2.bb index 20d4f27c11..098a558c4e 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.2.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.2.bb @@ -1,11 +1,12 @@ require qt4-embedded.inc -PR = "${INC_PR}.7" +PR = "${INC_PR}.8" PROVIDES += "qt4-embedded" -QT_GLFLAGS = "-opengl es2 -no-openvg -depths 16,24,32 -plugin-gfx-powervr" +QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr" require qt-${PV}.inc +SRC_URI += "file://cursor-hack.diff;patch=1" FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" diff --git a/recipes/qt4/qt4-tools-native.inc b/recipes/qt4/qt4-tools-native.inc index bd0d2e138e..9bfffe3bf0 100644 --- a/recipes/qt4/qt4-tools-native.inc +++ b/recipes/qt4/qt4-tools-native.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" PRIORITY = "optional" LICENSE = "GPL" -INC_PR = "r6" +INC_PR = "r7" inherit native @@ -59,17 +59,19 @@ do_compile() { done } -do_stage() { - install -d ${STAGING_BINDIR_NATIVE}/ - install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2 +NATIVE_INSTALL_WORKS = "1" + +do_install() { + install -d ${D}${bindir}/ + install -m 0755 bin/qmake ${D}${bindir}/qmake2 for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do - install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4 + install -m 0755 bin/${i} ${D}${bindir}/${i}4 done - install -d ${STAGING_DATADIR_NATIVE}/qt4/ - cp -PfR mkspecs ${STAGING_DATADIR_NATIVE}/qt4/ - ln -sf linux-g++ ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/${BUILD_OS}-oe-g++ - cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${STAGING_DATADIR_NATIVE}/qt4/mkspecs/common/ + install -d ${D}${datadir}/qt4/ + cp -PfR mkspecs ${D}${datadir}/qt4/ + ln -sf linux-g++ ${D}${datadir}/qt4/mkspecs/${BUILD_OS}-oe-g++ + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf ${D}${datadir}/qt4/mkspecs/common/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DATADIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${D}${datadir}/qt4/ } diff --git a/recipes/qt4/qt4-x11-free-gles/linux.conf b/recipes/qt4/qt4-x11-free-gles/linux.conf index ef641f54a9..70eccce125 100644 --- a/recipes/qt4/qt4-x11-free-gles/linux.conf +++ b/recipes/qt4/qt4-x11-free-gles/linux.conf @@ -60,6 +60,4 @@ QMAKE_MKDIR = mkdir -p QMAKE_INSTALL_FILE = install -m 644 -p QMAKE_INSTALL_PROGRAM = install -m 755 -p -DEFINES += QT_NO_OPENVG - include(unix.conf) diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb index a1b4e877b1..307770f0dc 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb @@ -1,7 +1,7 @@ require qt4-x11-free.inc -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" -QT_GLFLAGS = "-opengl es2 -no-openvg -depths 16,24,32 " +QT_GLFLAGS = "-opengl es2 -depths 16,24,32 " require qt-${PV}.inc |