From a94b157c1697d6391c94a0eb8f8cbd922703dd9c Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Wed, 10 Oct 2018 17:28:45 +0100
Subject: [PATCH] Replace MantidWidgets.qrc with instrumentview.qrc
The former purely contained icons for the instrument view. These
now live in a separate resource file compiled with the library
rather than with the MantidPlot executable so that they are
always available wherever the library is used.
---
MantidPlot/CMakeLists.txt | 1 -
images/{MantidWidgets.qrc => instrumentview.qrc} | 0
qt/widgets/instrumentview/CMakeLists.txt | 4 ++++
3 files changed, 4 insertions(+), 1 deletion(-)
rename images/{MantidWidgets.qrc => instrumentview.qrc} (100%)
diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index 9006e50ef31..276d1912e16 100644
--- a/MantidPlot/CMakeLists.txt
+++ b/MantidPlot/CMakeLists.txt
@@ -652,7 +652,6 @@ include_directories ( ${CMAKE_CURRENT_BINARY_DIR} )
###########################################################################
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/images.qrc )
-qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images/MantidWidgets.qrc )
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/images//fonts/fonts.qrc )
qt4_add_resources ( RES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/icons.qrc )
qt4_add_resources ( RES_FILES ${PROJECT_SOURCE_DIR}/scripts/ErrorReporter/errorreporter.qrc )
diff --git a/images/MantidWidgets.qrc b/images/instrumentview.qrc
similarity index 100%
rename from images/MantidWidgets.qrc
rename to images/instrumentview.qrc
diff --git a/qt/widgets/instrumentview/CMakeLists.txt b/qt/widgets/instrumentview/CMakeLists.txt
index 3a4b64e15ff..654e7e6dec3 100644
--- a/qt/widgets/instrumentview/CMakeLists.txt
+++ b/qt/widgets/instrumentview/CMakeLists.txt
@@ -137,6 +137,8 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsInstrumentView
${INC_FILES}
${QT4_INC_FILES}
UI ${UI_FILES}
+ RES
+ ../../../images/instrumentview.qrc
DEFS
IN_MANTIDQT_INSTRUMENTVIEW
INCLUDE_DIRS
@@ -176,6 +178,8 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsInstrumentView
${INC_FILES}
${QT5_INC_FILES}
UI ${UI_FILES}
+ RES
+ ../../../images/instrumentview.qrc
DEFS
IN_MANTIDQT_INSTRUMENTVIEW
INCLUDE_DIRS
--
GitLab