From 7263adda21f58e0f76b0228b0f5657aa84879927 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 13 Jan 2011 15:04:35 +0000 Subject: qt4: add qt4-embedded 4.6.3 from meta-openembedded Changes from the meta-openembedded version: * Change the order of includes so that embedded takes precedence (ensuring SRC_URI additions from qt-embedded.inc work) * Specify -embedded in qt-embedded.inc * Remove SRC_URI and S which should come from qt-${PV}.inc * Remove QT_DIR_NAME and QT_LIBINFIX as these come from qt4e.bbclass * Correct LICENSE * Set DESCRIPTION instead of SUMMARY as SUMMARY will inherit by default * Add qthelp-lib-qtclucene.patch (required to build) * Whitespace fixes Signed-off-by: Paul Eggleton --- meta/recipes-qt/qt4/files/qte.sh | 7 ++ .../qt4/files/qthelp-lib-qtclucene.patch | 86 ++++++++++++++++++++++ meta/recipes-qt/qt4/qt4-embedded.inc | 34 +++++++++ meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb | 9 +++ 4 files changed, 136 insertions(+) create mode 100644 meta/recipes-qt/qt4/files/qte.sh create mode 100644 meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch create mode 100644 meta/recipes-qt/qt4/qt4-embedded.inc create mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt4/files/qte.sh b/meta/recipes-qt/qt4/files/qte.sh new file mode 100644 index 0000000000..21d6ecbd6a --- /dev/null +++ b/meta/recipes-qt/qt4/files/qte.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -e /dev/input/touchscreen0 ] +then + QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 + export QWS_MOUSE_PROTO +fi diff --git a/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch new file mode 100644 index 0000000000..1d250d8a98 --- /dev/null +++ b/meta/recipes-qt/qt4/files/qthelp-lib-qtclucene.patch @@ -0,0 +1,86 @@ +qt-embedded: fix linker error in do_compile + +This patch ensures that we link to libQtCLucene where required (i.e. when +linking to libQtHelp) avoiding a linker error. + +Signed-off-by: Paul Eggleton + +Index: qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro +=================================================================== +--- qt-everywhere-opensource-src-4.6.3.orig/demos/qtdemo/qtdemo.pro 2011-01-11 16:06:47.382828004 +0000 ++++ qt-everywhere-opensource-src-4.6.3/demos/qtdemo/qtdemo.pro 2011-01-11 16:10:06.906828001 +0000 +@@ -76,3 +76,10 @@ + sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.ico *.icns *.rc *.plist + sources.path = $$[QT_INSTALL_DEMOS]/qtdemo + ++qclucene = QtCLucene$${QT_LIBINFIX} ++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { ++ mac:qclucene = $${qclucene}_debug ++ win32:qclucene = $${qclucene}d ++} ++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene ++LIBS_PRIVATE += -l$$qclucene +Index: qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro +=================================================================== +--- qt-everywhere-opensource-src-4.6.3.orig/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:05:56.598828002 +0000 ++++ qt-everywhere-opensource-src-4.6.3/examples/help/contextsensitivehelp/contextsensitivehelp.pro 2011-01-11 16:09:57.762828002 +0000 +@@ -18,3 +18,11 @@ + INSTALLS += target sources + + symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) ++ ++qclucene = QtCLucene$${QT_LIBINFIX} ++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { ++ mac:qclucene = $${qclucene}_debug ++ win32:qclucene = $${qclucene}d ++} ++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene ++LIBS_PRIVATE += -l$$qclucene +Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro +=================================================================== +--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/assistant/assistant.pro 2011-01-11 14:56:50.902828001 +0000 ++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/assistant/assistant.pro 2011-01-11 16:09:39.914828003 +0000 +@@ -85,3 +85,11 @@ + DEFINES += USE_STATIC_SQLITE_PLUGIN + } + } ++ ++qclucene = QtCLucene$${QT_LIBINFIX} ++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { ++ mac:qclucene = $${qclucene}_debug ++ win32:qclucene = $${qclucene}d ++} ++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene ++LIBS_PRIVATE += -l$$qclucene +Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro +=================================================================== +--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 14:56:50.918828002 +0000 ++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro 2011-01-11 16:09:44.538828001 +0000 +@@ -12,3 +12,11 @@ + main.cpp + + HEADERS += ../shared/helpgenerator.h ++ ++qclucene = QtCLucene$${QT_LIBINFIX} ++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { ++ mac:qclucene = $${qclucene}_debug ++ win32:qclucene = $${qclucene}d ++} ++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene ++LIBS_PRIVATE += -l$$qclucene +Index: qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro +=================================================================== +--- qt-everywhere-opensource-src-4.6.3.orig/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 14:56:50.930828002 +0000 ++++ qt-everywhere-opensource-src-4.6.3/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro 2011-01-11 16:09:50.274828003 +0000 +@@ -12,3 +12,11 @@ + main.cpp + + HEADERS += ../shared/helpgenerator.h ++ ++qclucene = QtCLucene$${QT_LIBINFIX} ++if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { ++ mac:qclucene = $${qclucene}_debug ++ win32:qclucene = $${qclucene}d ++} ++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene ++LIBS_PRIVATE += -l$$qclucene diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc new file mode 100644 index 0000000000..2ed1819f6f --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -0,0 +1,34 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the embedded version." +SECTION = "libs" +LICENSE = "LGPLv2.1 | GPLv3" +PRIORITY = "optional" +HOMEPAGE = "http://qt.nokia.com" +DEPENDS += "directfb tslib" +INC_PR = "r26" + +QT_BASE_NAME ?= "qt4-embedded" +QT_BASE_LIB ?= "libqt-embedded" + +# Set necessary variables in the profile +SRC_URI += "file://qte.sh" + +QT_CONFIG_FLAGS += " \ + -embedded ${QT_ARCH} \ + -qtlibinfix ${QT_LIBINFIX} \ + -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ + -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_${PN} += " ${sysconfdir}/profile.d/qte.sh" + +inherit qt4e + diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb new file mode 100644 index 0000000000..dd662aa3d8 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-embedded_4.6.3.bb @@ -0,0 +1,9 @@ +require qt-${PV}.inc +require qt4-embedded.inc + +SRC_URI += "file://qthelp-lib-qtclucene.patch" + +PR = "${INC_PR}.1" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " + -- cgit 1.2.3-korg