Import Geant4 10.7.0.beta source tree

2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
@@ -275,8 +275,11 @@ private:
  virtual G4bool GetHelpChoice(G4int&);// have to be implemeted because we heritate from G4VBasicShell
  bool eventFilter(QObject*,QEvent*);
  void ActivateCommand(G4String);
+#if QT_VERSION < 0x050F00
  QMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
-
+#else
+  QMultiMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
+#endif
  QWidget* CreateVisParametersTBWidget();
  QWidget* CreateHelpTBWidget();
  G4UIDockWidget* CreateCoutTBWidget();