Import Geant4 11.3.0.beta source tree

source/interfaces/implementation/include/G4UIExecutive.hh

@@ -51,6 +51,8 @@
 #ifndef G4UI_EXECUTIVE_HH
 #define G4UI_EXECUTIVE_HH
 
+#include "G4String.hh"
+#include "G4Types.hh"
 #include "G4VUIshell.hh"
 
 #include <map>

source/interfaces/implementation/include/G4UIQt.hh

@@ -79,6 +79,7 @@ class QToolButton;
 //
 // Class description - end :
 
+#if QT_VERSION < 0x060000
 class G4QTabWidget : public QTabWidget
 {
  public:
@@ -99,6 +100,7 @@ class G4QTabWidget : public QTabWidget
   }
   inline QSize sizeHint() const override { return QSize(fPreferedSizeX, fPreferedSizeY); }
 };
+#endif
 
 class G4UIOutputString
 {
@@ -346,7 +348,11 @@ public:
   QWidget* fViewerPropertiesWidget;
   QWidget* fPickInfosWidget;
   QLineEdit* fHelpLine;
+#if QT_VERSION < 0x060000
   G4QTabWidget* fViewerTabWidget;
+#else
+  QTabWidget* fViewerTabWidget;
+#endif
   QString fCoutText;
   QTextBrowser* fStartPage;
   QSplitter* fHelpVSplitter;