Merge branch 'V7_dev'

[modules/paravis.git] / src / PVGUI / PVGUI_Module.h

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index 7c1a8642d1f27ba11e1991cffa15a7c1e62253ed..bbeed82bdc63333b3f7fee268c1a9664b53d2809 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -1,6 +1,6 @@
 // PARAVIS : ParaView wrapper SALOME module
 //
-// Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -217,9 +217,11 @@ private:
 
   typedef QMap<int, bool> DockWindowMap;         
   DockWindowMap           myCommonMap; 
-
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   QtMsgHandler            myOldMsgHandler;
-
+#else  
+  QtMessageHandler        myOldMsgHandler;
+#endif  
   vtkEventQtSlotConnect*  VTKConnect;
 
   pqPythonScriptEditor*   myTraceWindow;