Factor out Qt types declaration into separate file. Now Qt3 and Qt4 can

be both initialized.


[SVN r30772]

v2/tools/qt.jam

@@ -48,7 +48,9 @@ rule init ( prefix ? )
         
         generators.register-standard qt.moc : H : CPP(moc_%) : <allow>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 : <allow>qt ;

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 = 

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 ;