Changeset 609 for trunk/geant4/interfaces/basic

Timestamp:

Nov 16, 2007, 11:59:21 AM (17 years ago)

Author:

garnier

Message:

r659@mac-90108: laurentgarnier | 2007-11-16 12:02:01 +0100
mise a jour de Geant4 au head ET qq mise a jour pour Qt de mon cote

Location:

trunk/geant4/interfaces/basic

Files:

• GNUmakefile (modified) (2 diffs)
• include/G4UIQt.hh (modified) (2 diffs)

trunk/geant4/interfaces/basic/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.3 2007/05/21 07:30:33 kmura Exp $
+# $Id: GNUmakefile,v 1.4 2007/10/29 18:49:45 asaim Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.
@@ -16 +16 @@
 CPPFLAGS += -I$(G4BASE)/interfaces/common/include
 CPPFLAGS += -I$(G4BASE)/intercoms/include
-CPPFLAGS += -I$(G4BASE)/global/management/include \
-            -I$(G4BASE)/global/HEPRandom/include \
-            -I$(G4BASE)/global/HEPGeometry/include \
-            -I$(G4BASE)/run/include \
-            -I$(G4BASE)/event/include \
-            -I$(G4BASE)/track/include \
-            -I$(G4BASE)/tracking/include \
-            -I$(G4BASE)/particles/management/include \
-            -I$(G4BASE)/processes/management/include \
-            -I$(G4BASE)/processes/cuts/include \
-            -I$(G4BASE)/processes/electromagnetic/utils/include \
-            -I$(G4BASE)/processes/transportation/include \
-            -I$(G4BASE)/processes/decay/include \
-            -I$(G4BASE)/materials/include \
-            -I$(G4BASE)/geometry/management/include \
-            -I$(G4BASE)/geometry/volumes/include \
-            -I$(G4BASE)/geometry/navigation/include \
-            -I$(G4BASE)/geometry/magneticfield/include \
-            -I$(G4BASE)/geometry/biasing/include \
-            -I$(G4BASE)/digits_hits/detector/include \
-            -I$(G4BASE)/digits_hits/hits/include \
-            -I$(G4BASE)/digits_hits/digits/include \
-            -I$(G4BASE)/interfaces/common/include \
-            -I$(G4BASE)/interfaces/basic/include \
-            -I$(G4BASE)/intercoms/include \
-            -I$(G4BASE)/graphics_reps/include
 
 include $(G4INSTALL)/config/common.gmk

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.6 2007/11/15 18:24:27 lgarnier Exp $
+// $Id: G4UIQt.hh,v 1.7 2007/11/15 18:53:59 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -149 +149 @@
   void ButtonCallback(const QString&);
   void HelpTreeClicCallback();
+#if QT_VERSION < 0x040000
+  void HelpTreeDoubleClicCallback( QListViewItem*, int);
+#else
   void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
+#endif
   void ShowHelpCallback();
   void CommandHistoryCallback();