From Valeri Fine:

rootcintrule.pri:
   - Use the CPP preprocessor (-p) option to generate RootCint dictionary
     Qt4 headers are too complex to pass the Cint builtin preprocessor

rootlibs.pri:
   Fix the typo defining the path to the RIO library


git-svn-id: http://root.cern.ch/svn/root/trunk@22933 27541ba8-7e3a-0410-8455-c3a389f83636

qt/Module.mk

@@ -90,7 +90,7 @@ $(GQTLIB):      $(GQTO) $(GQTDO) $(GQTMOCO) $(ORDER_) $(MAINLIBS) $(GQTLIBDEP)
 		   "$(GQTO) $(GQTMOCO) $(GQTDO)" \
 		   "$(GQTLIBEXTRA) $(QTLIBDIR) $(QTLIB)"
 
-$(GQTDS):       $(GQTH1) $(GQTL) $(ROOTCINTTMPDEP)
+$(GQTDS):       $(GQTH1) $(GQTL) $(ROOTCINTTMPEXE)
 		@echo "Generating dictionary $@..."
 		$(ROOTCINTTMP) -f $@ -c $(GQTH1) $(GQTL)
 
@@ -128,10 +128,9 @@ endif
 
 qtcint: lib/qtcint.dll
 
-lib/qtcint.dll: cint/lib/qt/qtcint.h \
+lib/qtcint.dll: $(CINTTMP) $(ROOTCINTTMPEXE) cint/lib/qt/qtcint.h \
                 cint/lib/qt/qtclasses.h cint/lib/qt/qtglobals.h \
-                cint/lib/qt/qtfunctions.h \
-		$(ROOTCINTTMPDEP) $(CINTTMP)
+                cint/lib/qt/qtfunctions.h
 	$(MAKECINTDLL) $(PLATFORM) C++ qtcint qt \
 	  " -p $(GQTCXXFLAGS) qtcint.h " \
            "$(CINTTMP)" "$(ROOTCINTTMP)" \

qt/inc/rootcintrule.pri

@@ -4,7 +4,7 @@
 # Qmake include file to add the rules to create RootCint Dictionary
 #-------------------------------------------------------------------------
 #
-# $Id: rootcintrule.pri,v 1.18 2006/09/09 20:44:53 fine Exp $
+# $Id: rootcintrule.pri,v 1.19 2008/02/15 23:43:42 fine Exp $
 #
 # Copyright (C) 2002 by Valeri Fine.  All rights reserved.
 #
@@ -107,7 +107,7 @@ exists ($$includeFile){
   win32:  rootcint.commands    +=$(ROOTSYS)\bin\rootcint.exe
   unix:   rootcint.commands    +=$(ROOTSYS)/bin/rootcint
 
-  rootcint.commands    +=  -f $$rootcint.target  -c $$DICTDEFINES $(INCPATH) $$CREATE_ROOT_DICT_FOR_CLASSES
+  rootcint.commands    +=  -f $$rootcint.target  -c -p $$DICTDEFINES $(INCPATH) $$CREATE_ROOT_DICT_FOR_CLASSES
   rootcint.depends      = $$CREATE_ROOT_DICT_FOR_CLASSES
   
   rootcintecho.commands = @echo "Generating dictionary $$rootcint.target for $$CREATE_ROOT_DICT_FOR_CLASSES classes"

qt/inc/rootlibs.pri

@@ -4,7 +4,7 @@
 # Qmake include file to add the rules to create RootCint Dictionary
 #-------------------------------------------------------------------------
 #
-# $Id: rootlibs.pri,v 1.26 2007/08/21 21:56:17 fine Exp $
+# $Id: rootlibs.pri,v 1.27 2008/02/18 20:47:43 fine Exp $
 #
 # Copyright (C) 2002 by Valeri Fine.  All rights reserved.
 #
@@ -62,9 +62,9 @@ win32 {
       -include:_G__cpp_setupG__Hist       -include:_G__cpp_setupG__Graf1  -include:_G__cpp_setupG__G3D     \
       -include:_G__cpp_setupG__GPad       -include:_G__cpp_setupG__Tree   -include:_G__cpp_setupG__Rint    \
       -include:_G__cpp_setupG__PostScript -include:_G__cpp_setupG__Matrix -include:_G__cpp_setupG__Physics \
-      -include:_G__cpp_setupG__Gui1       -include:_G__cpp_setupG__Geom1  
+      -include:_G__cpp_setupG__Gui1       -include:_G__cpp_setupG__Geom1 
     
-   exists( $(ROOTSYS)/lib/lib/libRIO.lib ) {
+   exists( $(ROOTSYS)/lib/libRIO.lib ) {
       LIBS	+= -include:_G__cpp_setupG__IO
    }   
 
@@ -84,7 +84,7 @@ win32 {
     "$(ROOTSYS)/lib/libGeom.lib"   "$(ROOTSYS)/lib/libTable.lib"                                         \
     "$(ROOTSYS)/lib/libGQt.lib"   
     
-   exists( $(ROOTSYS)/lib/lib/libRIO.lib ) {
+   exists( $(ROOTSYS)/lib/libRIO.lib ) {
       LIBS	+= "$(ROOTSYS)/lib/libRIO.lib" 
    }