Unverified Commit 465fc1f7 authored by Antti Soininen's avatar Antti Soininen Committed by GitHub
Browse files

Merge pull request #23668 from mantidproject/23667_slim_down_MantidQtCommonWidgetsQt5_lib

Separate included files for Qt4 and Qt5 libraries
parents 478413e2 9606b9fe
......@@ -245,9 +245,14 @@ endfunction ()
function (mtd_add_qt_tests)
_qt_versions(_qt_vers ${ARGN})
# Create targets
# Create test executables
foreach(_ver ${_qt_vers})
mtd_add_qt_test_executable (QT_VERSION ${_ver} ${ARGN})
if (_ver EQUAL 4 AND ENABLE_MANTIDPLOT)
mtd_add_qt_test_executable (QT_VERSION ${_ver} ${ARGN})
endif ()
if (_ver EQUAL 5 AND ENABLE_WORKBENCH)
mtd_add_qt_test_executable (QT_VERSION ${_ver} ${ARGN})
endif ()
endforeach()
endfunction()
......
This diff is collapsed.
......@@ -9,6 +9,7 @@ set ( SRC_FILES src/CatalogPublishDialog.cpp
src/LOQScriptInputDialog.cpp
src/MantidGLWidget.cpp
src/GetNegMuMuonicXRDDialog.cpp
src/PeriodicTableWidget.cpp
src/PlotAsymmetryByLogValueDialog.cpp
src/SampleShapeHelpers.cpp
src/SmoothNeighboursDialog.cpp
......@@ -16,25 +17,26 @@ set ( SRC_FILES src/CatalogPublishDialog.cpp
)
set ( MOC_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CreateSampleShapeDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/FitDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDAEDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadRawDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/MantidGLWidget.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/GetNegMuMuonicXRDDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SampleShapeHelpers.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SmoothNeighboursDialog.h
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/SortTableWorkspaceDialog.h
)
# Include files aren't required, but this makes them appear in Visual Studio
set ( INC_FILES
${MOC_FILES}
${MOC_FILES}
)
set ( UI_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog.ui
......@@ -42,6 +44,7 @@ set ( UI_FILES inc/MantidQtWidgets/Plugins/AlgorithmDialogs/CatalogPublishDialog
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/ConvertTableToMatrixWorkspaceDialog.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/DiagScriptInputDialog.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LOQScriptInputDialog.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/PlotAsymmetryByLogValueDialog.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/LoadDialog.ui
inc/MantidQtWidgets/Plugins/AlgorithmDialogs/StartLiveDataDialog.ui
......
......@@ -2,7 +2,7 @@
#define MANTIDQT_CUSTOM_DIALOGS_GETNEGMUMUONICXRD_H_
#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "MantidQtWidgets/Common/PeriodicTableWidget.h"
#include "MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h"
#include <QDoubleSpinBox>
namespace MantidQt {
......
......@@ -32,7 +32,7 @@
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class EXPORT_OPT_MANTIDQT_COMMON PeriodicTableWidget : public QWidget {
class PeriodicTableWidget : public QWidget {
Q_OBJECT
public:
......
#include "MantidQtWidgets/Common/PeriodicTableWidget.h"
#include "MantidQtWidgets/Plugins/AlgorithmDialogs/PeriodicTableWidget.h"
#include <QVector>
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment