From 7eefb59889007f2cc2a5b65ec24f2652077ddbb0 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 20 Apr 2005 11:03:06 +0000
Subject: [PATCH] defs.mk: Add support for qt beta 2

---
 make/defs.mk | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 77db8046..4648ff33 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -152,12 +152,21 @@ INSTALLED_SHOBJS  = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
 ifeq ($(USE_QT),true)
 USE_X = true 
 
-ifeq ($(QT_VERSION),3)
-QT_PREFIX = /usr/lib/qt3
-else
+ifeq ($(QT_VERSION),2)
 QT_PREFIX = /usr/lib/qt2
+else
+	ifeq ($(QT_VERSION),3)
+	QT_PREFIX = /usr/lib/qt3
+	else
+		ifeq ($(QT_VERSION),4)
+		QT_PREFIX = $(HOME)/opt/qt4-b2
+		INCLUDE  += -I$(QT_PREFIX)/include/Qt
+		endif
+	endif
 endif
 
+INCLUDE  += -I$(QT_PREFIX)/include
+
 LD_LIB_PATH += $(QT_PREFIX)/lib
 
 MOC = $(QT_PREFIX)/bin/moc
@@ -178,11 +187,14 @@ OBJ       += $(patsubst %.cpp,%.o,$(UIC_CPP))
 ifdef REENTRANT
 LPPFLAGS += -L$(QT_PREFIX)/lib -lqt-mt
 else
-LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
-endif
-INCLUDE  += -I$(QT_PREFIX)/include
+	ifneq ($(QT_VERSION),4)
+	LPPFLAGS += -L$(QT_PREFIX)/lib -lqt
+	else
+	LPPFLAGS += -L$(QT_PREFIX)/lib -lQtGui_debug -lQtCore_debug
+	endif
 endif
 
+endif
 ifeq ($(USE_X),true)
 LDFLAGS  += -L/usr/X11/lib -lXext -lX11
 endif