diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
| commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
| tree | 61030608675a792923aff657516c48a6a2048693 /recipes/qt4/qt4-embedded-4.6.0 | |
| parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
| parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
| download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz | |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'recipes/qt4/qt4-embedded-4.6.0')
| -rw-r--r-- | recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch | 12 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded-4.6.0/linux.conf | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch index 070b4ac9c1..fce5bba938 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch +++ b/recipes/qt4/qt4-embedded-4.6.0/0010-no-simpledecoration-example.patch @@ -1,9 +1,11 @@ ---- qt-embedded-linux-opensource-src-4.5.0.orig/examples/qws/qws.pro 2009-02-25 22:32:34.000000000 +0100 -+++ qt-embedded-linux-opensource-src-4.5.0/examples/qws/qws.pro 2009-03-26 19:53:19.000000000 +0100 -@@ -1,5 +1,5 @@ +--- /tmp/qws.pro 2009-12-10 19:30:08.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro 2009-12-10 19:30:21.000000000 +0100 +@@ -1,7 +1,7 @@ TEMPLATE = subdirs --SUBDIRS = framebuffer mousecalibration simpledecoration -+SUBDIRS = framebuffer mousecalibration + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration # install sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/recipes/qt4/qt4-embedded-4.6.0/linux.conf b/recipes/qt4/qt4-embedded-4.6.0/linux.conf index 2e862407bc..68ae80b929 100644 --- a/recipes/qt4/qt4-embedded-4.6.0/linux.conf +++ b/recipes/qt4/qt4-embedded-4.6.0/linux.conf @@ -15,7 +15,7 @@ QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = -QMAKE_LIBS = -lglib-2.0 +QMAKE_LIBS = -Wl,-rpath-link,SEDME/lib -lglib-2.0 QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) |