Changeset 606 for trunk/geant4/interfaces/common/src

Timestamp:

Nov 15, 2007, 11:56:03 AM (17 years ago)

Author:

garnier

Message:

r647@mac-90108: laurentgarnier | 2007-11-15 11:32:46 +0100
Ok en Qt 4.3.0

File:

• trunk/geant4/interfaces/common/src/G4Qt.cc (modified) (2 diffs)

trunk/geant4/interfaces/common/src/G4Qt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.4 2007/11/09 15:03:21 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.5 2007/11/15 10:10:02 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -91 +91 @@
   if(QtInited==FALSE) {  //Qt should be Inited once !
     printf("G4Qt::G4Qt inited Qt\n");
-
+#if QT_VERSION < 0x040000
+    qApp = new QApplication (a_argn, a_args);
+    //    QApplication qApp(a_argn, a_args);
+#else
     new QApplication (a_argn, a_args);
+#endif
 
     if(qApp==NULL) {
       G4cout        << "G4Qt : Unable to init Qt." << G4endl;
+    } else {
+      QtInited  = TRUE;
+      SetMainInteractor (qApp);
+      SetArguments      (a_argn,a_args);
+      printf("G4Qt::G4Qt inited Qt END\n");
     }
-    QtInited  = TRUE;
-    SetMainInteractor (qApp);
   }
-  SetArguments      (a_argn,a_args);
+  if (qApp)
+    printf("G4Qt::qApp exist\n");
+  else
+    printf("G4Qt::qApp not exist\n");
   //  AddDispatcher     ((G4DispatchFunction)XtDispatchEvent);
 }