summaryrefslogtreecommitdiff
path: root/packages/zroadmap/files/qt2-fixes-r1.patch
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-07-05 05:41:24 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-05 05:41:24 +0000
commitf3892ce8bcadd9240e16236bfd9f9c64695b3343 (patch)
tree0af97fccd66f86d28e5cb0c12bf6c949f5055d12 /packages/zroadmap/files/qt2-fixes-r1.patch
parent74244b4dbcfcbc5c074a204ba525852df9ddf999 (diff)
parent8b1b6f6b912325c17bea6b5a2f1c9f56e6a960fc (diff)
merge of 29e89051e9a2c503357df607dde2562d060d5989
and 69b99cade429033901bed0a58c27d6c6537ba35b
Diffstat (limited to 'packages/zroadmap/files/qt2-fixes-r1.patch')
-rw-r--r--packages/zroadmap/files/qt2-fixes-r1.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch
new file mode 100644
index 0000000000..24fe1c9bdb
--- /dev/null
+++ b/packages/zroadmap/files/qt2-fixes-r1.patch
@@ -0,0 +1,36 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- src/qt/qt_main.cc~qt2-fixes-r1.patch
++++ src/qt/qt_main.cc
+@@ -137,7 +137,7 @@
+ switch (orientation[0]) {
+ case 't':
+ case 'T': break;
+-
++#ifndef QWS
+ case 'b':
+ case 'B': moveDockWindow (toolBar, DockBottom); break;
+
+@@ -146,7 +146,7 @@
+
+ case 'r':
+ case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+ default: roadmap_log (ROADMAP_FATAL,
+ "Invalid toolbar orientation %s", orientation);
+ }
+--- src/qt/Makefile~qt2-fixes-r1.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+
+ ifeq ($(DESKTOP),QPE)
+ CFLAGS += -I$(QTDIR)/include -DQWS
+- LIBS += -lqte -lqpe
++ LIBS += -lqpe
+ INSTALLDIR=$(QTDIR)
+ endif
+