From 3ba458a38dd45f779151ec9b3ef1aeae32fae345 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 12 Aug 2005 10:26:36 +0000
Subject: [PATCH] Qt4 improvements:

- Add -name option to rcc invocation. This is needed to disambiguate
  the name of the generated initialising function. Since qmake takes
  the basename of  the  .qrc file I've copied this behaviour to have
  consistent naming.

- Add -I option to moc invocation. I've added the include and
  include/QtCore directories in order to be able to compile Qt4 with V2.

Patch from Juergen Hunold.


[SVN r30536]
---
 v2/tools/qt4.jam | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2/tools/qt4.jam b/v2/tools/qt4.jam
index d64da6446..99e0628e3 100644
--- a/v2/tools/qt4.jam
+++ b/v2/tools/qt4.jam
@@ -168,13 +168,13 @@ rule directory
 # Processes headers to create Qt MetaObject information
 actions moc
 {
-	$(.prefix)/bin/moc -f $(>) -o $(<)
+	$(.prefix)/bin/moc -I$(.prefix)/include -I$(.prefix)/include/QtCore -f $(>) -o $(<)
 }
 
 # Generates source files from resource files
 actions rcc
 {
-    $(.prefix)/bin/rcc $(>) -o $(<)
+    $(.prefix)/bin/rcc $(>) -name $(>:B) -o $(<)
 }
 
 # Generates user-interface source from .ui files