Changeset 1134

Timestamp:

Oct 19, 2009, 9:43:25 AM (15 years ago)

Author:

garnier

Message:

en test

Location:

trunk/source/interfaces

Files:

• History (modified) (2 diffs)
• basic/GNUmakefile (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (3 diffs)
• common/GNUmakefile (modified) (1 diff)
• common/src/G4Qt.cc (modified) (1 diff)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.113 2009/05/28 06:13:21 kmura Exp $
+$Id: History,v 1.115 2009/10/19 07:37:48 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -19 +19 @@
 
 =======
+19 October, 2009 L. Garnier
+ - basic/GNUMakefile Add optionnal debug flag
+
 6 October, 2009 L. Garnier
+ - G4UIQt Fix a problem on macOSX 10.6 with Qt 4.6(preview)
  - Change GEANT4_QT_DEBUG flag for G4DEBUG_INTERFACES_BASIC and 
    G4DEBUG_INTERFACES_COMMON

trunk/source/interfaces/basic/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.6 2008/04/30 10:00:14 lgarnier Exp $
+# $Id: GNUmakefile,v 1.7 2009/10/19 07:37:48 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.26 2009/05/15 09:36:17 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.27 2009/10/07 09:12:35 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -156 +156 @@
 
   QWidget *mainWidget = new QWidget(fMainWindow);
-  QSplitter *splitter = new QSplitter(mainWidget);
-  splitter->setOrientation(Qt::Vertical);
+  QSplitter *splitter = new QSplitter(Qt::Vertical,mainWidget);
 
   // Set layouts
@@ -298 +297 @@
   G4Qt* interactorManager = G4Qt::getInstance ();
 
-#if QT_VERSION >= 0x040000
-#if QT_VERSION >= 0x040200
-  fMainWindow->setVisible(true);
-#else
   fMainWindow->show();
-#endif
-#else
-  fMainWindow->show();
-#endif
+
   Prompt("session");
   exitSession = false;

trunk/source/interfaces/common/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.3 2005/01/26 08:50:58 gcosmo Exp $
+# $Id: GNUmakefile,v 1.4 2009/10/19 07:37:48 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/common library.  John Allison, 6/7/98.

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.13 2009/03/31 09:03:58 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.14 2009/10/07 09:12:35 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //