From 4086ae176c0a829e447e37faf4ce2eeba5199e47 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 1 Sep 2005 10:36:16 +0000 Subject: [PATCH] Factor out Qt types declaration into separate file. Now Qt3 and Qt4 can be both initialized. [SVN r30772] --- v2/tools/qt.jam | 4 +++- v2/tools/qt4.jam | 4 +--- v2/tools/types/qt.jam | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 v2/tools/types/qt.jam diff --git a/v2/tools/qt.jam b/v2/tools/qt.jam index 8b4ba32c8..be998d886 100644 --- a/v2/tools/qt.jam +++ b/v2/tools/qt.jam @@ -48,7 +48,9 @@ rule init ( prefix ? ) generators.register-standard qt.moc : H : CPP(moc_%) : qt ; - type.register UI : ui ; + # The UI type is defined in types/qt.jam, + # and UIC_H is only used in qt.jam, but not in qt4.jam, so + # define it here. type.register UIC_H : : H ; generators.register-standard qt.uic-h : UI : UIC_H : qt ; diff --git a/v2/tools/qt4.jam b/v2/tools/qt4.jam index b3f7d76fc..b8f3c51eb 100644 --- a/v2/tools/qt4.jam +++ b/v2/tools/qt4.jam @@ -67,12 +67,10 @@ rule init ( prefix ? ) generators.register-standard qt4.moc : H : CPP(moc_%) ; # Generates header file from .ui file - type.register UI : ui ; - # The generator class is defined after 'init'. + # The generator class is defined below the 'init' function. generators.register [ new uic-h-generator qt4.uic-h : UI : OBJ ] ; # Generates .cpp file from qrc file - type.register QRC : qrc ; generators.register-standard qt4.rcc : QRC : CPP(qrc_%) ; local usage-requirements = diff --git a/v2/tools/types/qt.jam b/v2/tools/types/qt.jam new file mode 100644 index 000000000..e3aed652e --- /dev/null +++ b/v2/tools/types/qt.jam @@ -0,0 +1,6 @@ +# Copyright Vladimir Prus 2005. Distributed under the Boost +# Software License, Version 1.0. (See accompanying +# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +type UI : ui ; +type QRC : qrc ;