diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-05-09 10:55:01 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-05-10 17:24:41 +0200 |
| commit | acd000615cb77c4805f43df177fbe08cd2244195 (patch) | |
| tree | 2a8f11e9c22e6efe62a2707a4e325c62aaa50cc4 /recipes/qt4 | |
| parent | ad7c0216a5e5caf7a090a708e03f66363b888a00 (diff) | |
qt4-embedded: fix decorations and mouse configs
Imported from http://arago-project.org/git/?p=arago.git;a=commitdiff;h=0fe5a365d34a07f93861741e25c5cfaaf662aa1c
Original patch done by Denys Dmytriyenko
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/files/qte.sh | 5 | ||||
| -rw-r--r-- | recipes/qt4/qt-4.6.2.inc | 3 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 16 |
3 files changed, 21 insertions, 3 deletions
diff --git a/recipes/qt4/files/qte.sh b/recipes/qt4/files/qte.sh new file mode 100644 index 0000000000..ddea77dcf4 --- /dev/null +++ b/recipes/qt4/files/qte.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 + +export QWS_MOUSE_PROTO diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc index 3ec329f373..ffd7a1d431 100644 --- a/recipes/qt4/qt-4.6.2.inc +++ b/recipes/qt4/qt-4.6.2.inc @@ -16,6 +16,9 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://linux.conf \ " +# Set necessary variables in the profile +SRC_URI += "file://qte.sh" + S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" do_configure_prepend() { diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 7e0be6e955..888b1b8ad8 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r18" +INC_PR = "r19" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" @@ -24,18 +24,28 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ file://g++.conf \ file://linux.conf \ " + +# Set necessary variables in the profile +SRC_URI += "file://qte.sh" + S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" QT_CONFIG_FLAGS += " \ -qtlibinfix ${QT_LIBINFIX} \ - -qt-decoration-styled -plugin-decoration-default -plugin-decoration-windows \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ - -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb \ + -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ -qt-kbd-tty \ -DQT_KEYPAD_NAVIGATION \ " require qt4.inc +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/ +} + +FILES_qt4-embedded += " ${sysconfdir}/profile.d/qte.sh" + inherit qt4e |