aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/qt4/qt4-x11-free-4.6.0
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/qt4/qt4-x11-free-4.6.0')
-rw-r--r--recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch11
-rw-r--r--recipes/qt4/qt4-x11-free-4.6.0/linux.conf2
2 files changed, 12 insertions, 1 deletions
diff --git a/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch
new file mode 100644
index 0000000000..fce5bba938
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch
@@ -0,0 +1,11 @@
+--- /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
+ # 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-x11-free-4.6.0/linux.conf b/recipes/qt4/qt4-x11-free-4.6.0/linux.conf
index 2e862407bc..68ae80b929 100644
--- a/recipes/qt4/qt4-x11-free-4.6.0/linux.conf
+++ b/recipes/qt4/qt4-x11-free-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)