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

Subject: [Boost-commit] svn:boost r82144 - in branches/release: . tools tools/build/v2 tools/build/v2/tools tools/build/v2/tools/types
From: jhunold_at_[hidden]
Date: 2012-12-21 06:54:40

Author: jhunold
Date: 2012-12-21 06:54:40 EST (Fri, 21 Dec 2012)
New Revision: 82144
URL: http://svn.boost.org/trac/boost/changeset/82144

Log:
Merge 82100 from ^/trunk

  ------------------------------------------------------------------------
  r82100 | jhunold | 2012-12-19 17:22:55 +0100 (Mi, 19 Dez 2012) | 1 line
  
  Disambiguate types created by Qt4 and Qt5 tools
  ------------------------------------------------------------------------

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      |     8 ++++----                                
   branches/release/tools/build/v2/tools/types/qt.jam |     2 ++                                      
   2 files changed, 6 insertions(+), 4 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-21 06:54:40 EST (Fri, 21 Dec 2012)
@@ -219,10 +219,10 @@
 
         # The OBJ result type is a fake here too.
         generators.register [ new moc-h-5-generator
-            qt5.moc.inc : MOCCABLE_CPP : OBJ : <allow>qt5 ] ;
+            qt5.moc.inc : MOCCABLE5_CPP : OBJ : <allow>qt5 ] ;
 
         generators.register [ new moc-inc-5-generator
-            qt5.moc.inc : MOCCABLE_H : OBJ : <allow>qt5 ] ;
+            qt5.moc.inc : MOCCABLE5_H : OBJ : <allow>qt5 ] ;
 
         # Generates .cpp files from .qrc files.
         generators.register-standard qt5.rcc : QRC : CPP(qrc_%) : <allow>qt5 ;
@@ -518,7 +518,7 @@
 
     rule run ( project name ? : property-set : sources * )
     {
-        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE_CPP
+        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE5_CPP
         {
             name = [ $(sources[0]).name ] ;
             name = $(name:B) ;
@@ -553,7 +553,7 @@
 
     rule run ( project name ? : property-set : sources * )
     {
-        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE_H
+        if ! $(sources[2]) && [ $(sources[1]).type ] = MOCCABLE5_H
         {
             name = [ $(sources[0]).name ] ;
             name = $(name:B) ;

Modified: branches/release/tools/build/v2/tools/types/qt.jam
==============================================================================
--- branches/release/tools/build/v2/tools/types/qt.jam	(original)
+++ branches/release/tools/build/v2/tools/types/qt.jam	2012-12-21 06:54:40 EST (Fri, 21 Dec 2012)
@@ -6,5 +6,7 @@
 type QRC : qrc ;
 type MOCCABLE_CPP ;
 type MOCCABLE_H ;
+type MOCCABLE5_CPP ;
+type MOCCABLE5_H ;
 # Result of running moc.
 type MOC : moc : H ;