summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
3 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 9914c61d6f..1ede922e68 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3" 3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 5DEPENDS += "directfb tslib"
6INC_PR = "r30" 6INC_PR = "r31"
7 7
8QT_BASE_NAME ?= "qt4-embedded" 8QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 0a714be87a..a360ec3440 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r27" 8INC_PR = "r28"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 5545be700a..7f3e1a4785 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -293,7 +293,6 @@ do_install() {
293 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ 293 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
294 -e s#" -Wl,-rpath-link,${S}/lib"##g \ 294 -e s#" -Wl,-rpath-link,${S}/lib"##g \
295 -e s#" -Wl,-rpath-link,${libdir}"##g \ 295 -e s#" -Wl,-rpath-link,${libdir}"##g \
296 -e 's#I/usr/include#Iincludedir}#g' \
297 -e 's#Iin#I${in#g' \ 296 -e 's#Iin#I${in#g' \
298 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc 297 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
299 298
@@ -310,8 +309,7 @@ do_install() {
310 309
311 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: 310 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here:
312 for pc in ${D}${libdir}/pkgconfig/*.pc ; do 311 for pc in ${D}${libdir}/pkgconfig/*.pc ; do
313 sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ 312 sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \
314 -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
315 -e 's:IP{:I${:g' $pc 313 -e 's:IP{:I${:g' $pc
316 done 314 done
317 315