[Boost-commit] svn:boost r82194 - in branches/release: . tools tools/build/v2 tools/build/v2/tools

Subject: [Boost-commit] svn:boost r82194 - in branches/release: . tools tools/build/v2 tools/build/v2/tools
From: jhunold_at_[hidden]
Date: 2012-12-23 16:04:06

Author: jhunold
Date: 2012-12-23 16:04:05 EST (Sun, 23 Dec 2012)
New Revision: 82194
URL: http://svn.boost.org/trac/boost/changeset/82194

Log:
Merge 82193 from ^/trunk

  ------------------------------------------------------------------------
  r82193 | jhunold | 2012-12-23 21:53:33 +0100 (So, 23 Dez 2012) | 2 lines
  
  Fix debug library name for QtCore. Fixes #7826
  
  ------------------------------------------------------------------------

Properties modified: 
   branches/release/   (props changed)
   branches/release/tools/   (props changed)
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/tools/qt5.jam |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/release/tools/build/v2/tools/qt5.jam
==============================================================================
--- branches/release/tools/build/v2/tools/qt5.jam	(original)
+++ branches/release/tools/build/v2/tools/qt5.jam	2012-12-23 16:04:05 EST (Sun, 23 Dec 2012)
@@ -318,7 +318,7 @@
 
        # debug versions on unix have to be built
        # separately and therefore have no suffix.
-       .suffix_version = "" ;
+       .infix_version = "" ;
        .suffix_debug = "" ;
 
        # Control flag for auto-configuration of the debug libraries.
@@ -387,7 +387,7 @@
 
            lib QtCore : $(main)
                : # requirements
-                 <name>QtCore$(.suffix_debug)$(.suffix_version)
+                 <name>Qt$(.infix_version)Core$(.suffix_debug)
                  <variant>debug
                  $(target-requirements)
                : # default-build