From 40dcb724bfe8de9cee258be58e1cb7d285afda8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= <jhunold@gmx.eu>
Date: Sun, 3 Jun 2012 15:13:05 +0000
Subject: [PATCH] Fix: correct library names of static Qt on Windows.

Static Qt libraries do not have the "4" suffix.
And it is not necessary to enhance the dll path when using static libraries.

[SVN r78801]
---
 v2/tools/qt4.jam | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/v2/tools/qt4.jam b/v2/tools/qt4.jam
index 71d1b7620..cd70b5c72 100644
--- a/v2/tools/qt4.jam
+++ b/v2/tools/qt4.jam
@@ -297,13 +297,19 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
    # Setup common pre-built Qt.
    # Special setup for QtCore on which everything depends
    {
+       local link = [ feature.get-values link : $(condition) ] ;
+
        local usage-requirements =
            <include>$(.incprefix)
            <library-path>$(.libprefix)
-           <dll-path>$(.libprefix)
            <threading>multi
            <allow>qt4 ;
 
+       if $(link) in shared
+       {
+           usage-requirements += <dll-path>$(.libprefix) ;
+       }
+
        local suffix ;
 
        # Since Qt-4.2, debug versions on unix have to be built
@@ -323,8 +329,11 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
        {
            .have_separate_debug = TRUE ;
 
-           # On NT, the libs have "4" suffix, and "d" suffix in debug builds.
-           .suffix_version = "4" ;
+           # On NT, the shared libs have "4" suffix, and "d" suffix in debug builds.
+           if $(link) in shared
+           {
+                .suffix_version = "4" ;
+           }
            .suffix_debug = "d" ;
 
            # On Windows we must link against the qtmain library