diff options
author | Graeme Gregory <dp@xora.org.uk> | 2009-08-13 17:30:51 +0100 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2009-08-13 17:30:51 +0100 |
commit | 321f298f4b9477ce563eeef68d82a28366788a52 (patch) | |
tree | 85d4fbfd46068eaca77311382a6ad99e0191dec9 /recipes/qt4/qt4-embedded.inc | |
parent | 819073c07c1deaac6143bb6eeea96a35a76451b5 (diff) | |
parent | 94a9ba7988f0d6586ecaf0b722d6b320cfdf94ae (diff) | |
download | openembedded-321f298f4b9477ce563eeef68d82a28366788a52.tar.gz |
Merge branch 'org.openembedded.dev' of /home/dp/openembedded/org.openembedded.dev into xora/angstrom-srcpv
Conflicts:
recipes/clutter/clutter-0.9_git.bb
recipes/clutter/clutter-gst-0.9_git.bb
recipes/efl1/edje_svn.bb
recipes/efl1/embryo_svn.bb
recipes/efl1/emotion_svn.bb
recipes/freesmartphone/cornucopia.inc
recipes/freesmartphone/dbus-hlid_git.bb
recipes/freesmartphone/frameworkd-devel_git.bb
recipes/freesmartphone/frameworkd_git.bb
recipes/freesmartphone/fso-abyss_git.bb
recipes/freesmartphone/fso-monitord_git.bb
recipes/freesmartphone/fso-sounds.bb
recipes/freesmartphone/fsod_git.bb
recipes/freesmartphone/libframeworkd-glib_git.bb
recipes/freesmartphone/libgsm0710mux_git.bb
recipes/freesmartphone/vala-dbus-binding-tool-native_git.bb
recipes/linux/linux-davinci_git.bb
recipes/opencv/opencv-samples_svn.bb
recipes/opencv/opencv_svn.bb
recipes/u-boot/u-boot_git.bb
recipes/uclibc/uclibc_git.bb
recipes/uclibc/uclibc_nptl.bb
recipes/wmiconfig/wmiconfig_svn.bb
Diffstat (limited to 'recipes/qt4/qt4-embedded.inc')
-rw-r--r-- | recipes/qt4/qt4-embedded.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 392ddc30bf..95b770a5a4 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -6,8 +6,8 @@ HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" INC_PR = "r14" -QT_BASE_NAME = "qt4-embedded" -QT_BASE_LIB = "libqt-embedded" +QT_BASE_NAME ?= "qt4-embedded" +QT_BASE_LIB ?= "libqt-embedded" QT_DIR_NAME = "qtopia" QT_LIBINFIX = "E" @@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ file://0007-openssl-host-includes.patch;patch=1 \ file://0008-qt-lib-infix.patch;patch=1 \ file://0009-support-2bpp.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ file://g++.conf \ file://linux.conf \ " |