Import Geant4 10.6.0 source tree

source/visualization/OpenInventor/History

@@ -19,6 +19,10 @@ committal in the CVS repository !
 History file for visualization/OpenInventor
 -------------------------------------------
 
+23rd October 2019 Ben Morgan (openinventor-V10-05-07)
+- Remove inclusion of QT_USE_FILE from CMake scripts.
+  All usage is now through the qtX_ macros and imported targets
+
 14 June 2019  Gabriele Cosmo (openinventor-V10-05-06)
 - Fixed compilation error in G4OpenInventorViewer::CompareForKernelVisit()
   for typo introduced in previous tag...

source/visualization/OpenInventor/sources.cmake

@@ -159,9 +159,6 @@ if(GEANT4_USE_QT AND GEANT4_USE_INVENTOR_QT)
     G4SoQt.cc
     )
 
-    # Include the UseQt file to build the moc wrappers
-    include(${QT_USE_FILE})
-
     # Add the moc sources - must use absolute path to the files
     QT4_WRAP_CPP(G4OI_MOC_SOURCES
         ${CMAKE_SOURCE_DIR}/source/visualization/OpenInventor/include/G4OpenInventorQt.hh

source/visualization/OpenInventor/src/G4OpenInventorXt.cc

@@ -67,7 +67,7 @@ void G4OpenInventorXt::Initialize()
 
   Widget top = (Widget)GetInteractorManager()->GetMainInteractor();
 
-  if(getenv("XENVIRONMENT")==NULL) {
+  if(std::getenv("XENVIRONMENT")==NULL) {
     XrmDatabase database = XrmGetDatabase(XtDisplay(top));
     if(database!=NULL) {
       XrmPutLineResource(&database,"*topShadowColor:white");

source/visualization/OpenInventor/src/G4OpenInventorXtExtended.cc

@@ -74,7 +74,7 @@ void G4OpenInventorXtExtended::Initialize()
   Widget top = (Widget)GetInteractorManager()->GetMainInteractor();
   G4cout << "TOP LEVEL WIDGET FOR SoXt::init() = " << top << G4endl;
 
-  if(getenv("XENVIRONMENT")==NULL) {
+  if(std::getenv("XENVIRONMENT")==NULL) {
     XrmDatabase database = XrmGetDatabase(XtDisplay(top));
     if(database!=NULL) {
       XrmPutLineResource(&database,"*topShadowColor:white");