From 66ef821822827e913b9416f38425896c3e742f89 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Sun, 23 Nov 2008 13:08:22 +0000
Subject: [PATCH] Stefan Fiedler: 	qt: add Config choice for qt default
 version

[2008101514210923087] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9355 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/x11/qt/config.in | 15 ++++++++-------
 package/x11/qt/qt.conf   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package/x11/qt/config.in b/package/x11/qt/config.in
index 34499c6cf..001944ae6 100644
--- a/package/x11/qt/config.in
+++ b/package/x11/qt/config.in
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,10 +21,10 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck qt X
-then
-	menu_begin MENU_PKG_QT 'Qt widget library Options'
-		bool 'Build static Qt libraries (see help)' \
-			ROCKCFG_PKG_QT_STATIC 0
-	menu_end
-fi
+menu_begin MENU_PKG_QT 'Qt widget library Options'
+	bool 'Build static Qt libraries (see help)' \
+		ROCKCFG_PKG_QT_STATIC 0
+	choice ROCKCFG_PKG_QT_DEFAULT qt3 \
+		qt3 'Use Qt 3.x as default Qt library' \
+		qt4 'Use Qt 4.x as default Qt library'
+menu_end
diff --git a/package/x11/qt/qt.conf b/package/x11/qt/qt.conf
index 858d83978..89b08f3dd 100644
--- a/package/x11/qt/qt.conf
+++ b/package/x11/qt/qt.conf
@@ -94,7 +94,7 @@ qt_pass() {
 		export QT${xpkg:2:1}DIR
 	EOT
 	# until kde 4 which will be based on qt4 the standard is qt3 here
-	if [ $xpkg == qt3 ]; then
+	if [ $xpkg == "$ROCKCFG_PKG_QT_DEFAULT" ]; then
 		cat >> $root/etc/profile.d/$xpkg <<-EOT
 			QTDIR=\$QT${xpkg:2:1}DIR
 			export QTDIR