diff options
author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
---|---|---|
committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch | |
parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch')
-rw-r--r-- | recipes/qt4/qt4-x11-free-4.6.0/0010-no-simpledecoration-example.patch | 11 |
1 files changed, 11 insertions, 0 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 |