summaryrefslogtreecommitdiff
path: root/packages/zroadmap/files
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-07-04 00:18:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-04 00:18:39 +0000
commitfab4f88c1807af93d74ee6d58a61660dc78993ee (patch)
tree2a7109b4285cf2c1fa3c7952747723269c40de27 /packages/zroadmap/files
parent3fd6cbd2ee79c56c94ead0f370ac1c49e033c429 (diff)
zroadmap cvs patch fixlet
Diffstat (limited to 'packages/zroadmap/files')
-rw-r--r--packages/zroadmap/files/qt2-fixes-r1.patch20
1 files changed, 6 insertions, 14 deletions
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch
index a17fefe869..24fe1c9bdb 100644
--- a/packages/zroadmap/files/qt2-fixes-r1.patch
+++ b/packages/zroadmap/files/qt2-fixes-r1.patch
@@ -3,9 +3,9 @@
# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
#
---- src/qt/qt_main.cc~qt2-fixes.patch
+--- src/qt/qt_main.cc~qt2-fixes-r1.patch
+++ src/qt/qt_main.cc
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
switch (orientation[0]) {
case 't':
case 'T': break;
@@ -14,7 +14,7 @@
case 'b':
case 'B': moveDockWindow (toolBar, DockBottom); break;
-@@ -145,7 +145,7 @@
+@@ -146,7 +146,7 @@
case 'r':
case 'R': moveDockWindow (toolBar, DockRight); break;
@@ -23,21 +23,13 @@
default: roadmap_log (ROADMAP_FATAL,
"Invalid toolbar orientation %s", orientation);
}
---- src/qt/Makefile~qt2-fixes.patch
+--- src/qt/Makefile~qt2-fixes-r1.patch
+++ src/qt/Makefile
-@@ -11,14 +11,9 @@
+@@ -19,7 +19,7 @@
- # --- QT-specific options ------------------------------------------------
-
--CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3
--CFLAGS += -fno-rtti -fno-exceptions
--LIBS += -L$(QTDIR)/lib -lqt-mt
--
--
ifeq ($(DESKTOP),QPE)
-- CFLAGS += -I$(QTDIR)/include -DQWS
+ CFLAGS += -I$(QTDIR)/include -DQWS
- LIBS += -lqte -lqpe
-+ CFLAGS += -I$(QTDIR)/include -DQWS
+ LIBS += -lqpe
INSTALLDIR=$(QTDIR)
endif