Support both 5.5 and 5.6 version of ParaView

diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 1b13be9c39e58e909a71998138860bce205bd4ec..6026eb462b4c31646ab39c60bfedf543fc0fc7f1 100644 (file)
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -49,6 +49,8 @@
 #include <vtkSMSessionProxyManager.h>
 #include <vtkSMProxyIterator.h>
 
+#include <vtkPVConfig.h>
+
 #include <QAction>
 #include <QCoreApplication>
 #include <QLayout>
@@ -57,7 +59,6 @@
 #include <QMenu>
 #include <QToolBar>
 
-
 PVViewer_GUIElements * PVViewer_GUIElements::theInstance = 0;
 
 PVViewer_GUIElements::PVViewer_GUIElements(QMainWindow* desk) :
@@ -122,7 +123,11 @@ void PVViewer_GUIElements::buildPVWidgets()
     // Catalyst Menu
     if (!catalystMenu) {
       catalystMenu = new QMenu(0);
+#if PARAVIEW_VERSION_MAJOR==5 && PARAVIEW_VERSION_MINOR>=6
+      pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu, myDesktop);
+#else
       pqParaViewMenuBuilders::buildCatalystMenu(*catalystMenu);
+#endif
     }
 
     mainToolBar = new pqMainControlsToolbar(myDesktop)