From 8d15ef3b6807698def533b7e6da6175980cd63e5 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 29 Jan 2003 06:37:26 +0000
Subject: [PATCH] Respect <threading> in QT support.

[SVN r17074]
---
 new/qt.jam | 11 ++++++++++-
 v2/qt.jam  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/new/qt.jam b/new/qt.jam
index d830198da..3a950e868 100644
--- a/new/qt.jam
+++ b/new/qt.jam
@@ -69,7 +69,16 @@ rule init ( prefix ? )
 
 rule qt.add-properties ( property : properties * )
 {
-    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
+    local lib-name ;
+    if <threading>multi in $(properties)
+    {
+	lib-name = qt-mt ;
+    }
+    else
+    {
+	lib-name = qt ;
+    }
+    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>$(lib-name) ;
 }
 
 # -f forces moc to include the processed source file.
diff --git a/v2/qt.jam b/v2/qt.jam
index d830198da..3a950e868 100644
--- a/v2/qt.jam
+++ b/v2/qt.jam
@@ -69,7 +69,16 @@ rule init ( prefix ? )
 
 rule qt.add-properties ( property : properties * )
 {
-    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>qt-mt ;
+    local lib-name ;
+    if <threading>multi in $(properties)
+    {
+	lib-name = qt-mt ;
+    }
+    else
+    {
+	lib-name = qt ;
+    }
+    return <include>$(.prefix)/include <dll-path>$(.prefix)/lib <library-path>$(.prefix)/lib <find-shared-library>$(lib-name) ;
 }
 
 # -f forces moc to include the processed source file.