Merge pull request #21642 from mantidproject/workbench-custom-dialogs

Added custom algorithm dialogs to the workbench

CMakeLists.txt

@@ -120,7 +120,7 @@ if (ENABLE_MANTIDPLOT)
 endif()
 
 if ( ENABLE_WORKBENCH )
-  find_package ( Qt5 COMPONENTS Core Gui Widgets REQUIRED )
+  find_package ( Qt5 COMPONENTS Core Gui Widgets OpenGL REQUIRED )
   if ( Qt5_FOUND )
     message ( STATUS "Found Qt ${Qt5_VERSION}: ${Qt5_DIR}" )
   endif()

qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt

@@ -54,7 +54,6 @@ set ( UI_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog
 include_directories ( inc inc/MantidQtWidgets/Plugins/AlgorithmDialogs )
 
 mtd_add_qt_library (TARGET_NAME MantidQtWidgetsPluginsAlgorithmDialogs
-  QT_VERSION 4
   SRC ${SRC_FILES}
   MOC ${MOC_FILES}
   NOMOC ${INC_FILES}
@@ -70,6 +69,8 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsPluginsAlgorithmDialogs
     ${OPENGL_LIBRARIES}
   QT4_LINK_LIBS
     Qt4::QtOpenGL
+  QT5_LINK_LIBS
+    Qt5::OpenGL
   MTD_QT_LINK_LIBS
     MantidQtWidgetsCommon
   OSX_INSTALL_RPATH

qt/widgets/plugins/algorithm_dialogs/inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h

@@ -160,9 +160,14 @@ public:
   void traverseInPostOrder(BinaryTreeWidgetItem *node,
                            QList<BinaryTreeWidgetItem *> &expression);
 
-  /// Called when the data in the model is changed
+/// Called when the data in the model is changed
+#if QT_VERSION < 0x050000
   void dataChanged(const QModelIndex &topLeft,
                    const QModelIndex &bottomRight) override;
+#else
+  void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
+                   const QVector<int> &roles = QVector<int>()) override;
+#endif
 
 signals:
   /// Emitted when data has changed

qt/widgets/plugins/algorithm_dialogs/src/CreateSampleShapeDialog.cpp

@@ -622,8 +622,13 @@ void BinaryTreeWidget::traverseInPostOrder(
   expression.append(node);
 }
 
+#if QT_VERSION < 0x050000
 void BinaryTreeWidget::dataChanged(const QModelIndex &topLeft,
                                    const QModelIndex &) {
+#else
+void BinaryTreeWidget::dataChanged(const QModelIndex &topLeft,
+                                   const QModelIndex &, const QVector<int> &) {
+#endif
   emit treeDataChange(
       dynamic_cast<BinaryTreeWidgetItem *>(itemFromIndex(topLeft)),
       topLeft.data(Qt::UserRole).toInt());