From a52010723fd5e58205c0c16a3ef5cfe8a9703cf3 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 3 Jul 2007 13:38:27 +0000
Subject: [PATCH] qt*.mk: Fix conditional QT_VERSION definition

Fix, sortof, conditional variable definitions of QT_VERSION.
---
 make/qt-defs.mk | 2 +-
 make/qtexe.mk   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/qt-defs.mk b/make/qt-defs.mk
index 91723aba..5308d02b 100644
--- a/make/qt-defs.mk
+++ b/make/qt-defs.mk
@@ -2,7 +2,7 @@ ifeq ($(USE_QT),true)
 
 USE_X                  = true
 CPPFLAGS              += -DQT_THREAD_SUPPORT  
-QT_VERSION             = 4.3.0
+QT_VERSION            ?= 4.3.0
 QT_MAJOR_VERSION      ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
 
 ifeq ($(QT_MAJOR_VERSION),2)
diff --git a/make/qtexe.mk b/make/qtexe.mk
index 59db11e1..5e1fb6d4 100644
--- a/make/qtexe.mk
+++ b/make/qtexe.mk
@@ -3,7 +3,9 @@
 # contact@jannet.de
 # $Id$
 
-include $(MODDIR)/make/qtversion.mk
+USE_QT = true
+
+include $(MODDIR)/make/qt-defs.mk
 include $(MODDIR)/make/exe.mk
 include $(MODDIR)/make/qt.mk