boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Disambiguate types created by Qt4 and Qt5 tools

Browse Source 
[SVN r82100]
This commit is contained in:
Jürgen Hunold
2012-12-19 16:22:55 +00:00
parent 4cb47ecdc0
commit 053c4d2be6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qt5.jam
View File

@@ -219,10 +219,10 @@ rule init ( prefix : version ? : condition * : namespace ? : infix ? : full_bin
# 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 @@ class moc-h-5-generator : generator
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 @@ class moc-inc-5-generator : generator
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) ;

2
src/tools/types/qt.jam
View File

@@ -6,5 +6,7 @@ type UI : ui ;
type QRC : qrc ;
type MOCCABLE_CPP ;
type MOCCABLE_H ;
type MOCCABLE5_CPP ;
type MOCCABLE5_H ;
# Result of running moc.
type MOC : moc : H ;