From e260253ba2893a1459b0204a709f36fd04558634 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Fri, 10 Aug 2018 14:59:33 +0100
Subject: [PATCH] Fix relative path to _commonqt5 in package.
---
buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in | 2 +-
.../mantidqt/widgets/workspacewidget/workspacetreewidget.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in b/buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in
index 80b3c3d06cf..0a0b7b90748 100644
--- a/buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in
+++ b/buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in
@@ -21,7 +21,7 @@ if [ -n "${LD_LIBRARY_PATH}" ]; then
LOCAL_LDPATH=${LOCAL_LDPATH}:${LD_LIBRARY_PATH}
fi
# define where python libraries are
-LOCAL_PYTHONPATH=@LOCAL_PYPATH@:${INSTALLDIR}/lib/mantidqt@PARAVIEW_PYTHON_PATHS@
+LOCAL_PYTHONPATH=@LOCAL_PYPATH@@PARAVIEW_PYTHON_PATHS@
if [ -n "${PYTHONPATH}" ]; then
LOCAL_PYTHONPATH=${LOCAL_PYTHONPATH}:${PYTHONPATH}
fi
diff --git a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
index f8fee5faa67..fbb79099061 100644
--- a/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
+++ b/qt/python/mantidqt/widgets/workspacewidget/workspacetreewidget.py
@@ -24,5 +24,5 @@ from __future__ import (absolute_import, unicode_literals)
from mantidqt.utils.qt import import_qt
-WorkspaceTreeWidget = import_qt('.._common', 'mantidqt.widgets.workspacewidget',
+WorkspaceTreeWidget = import_qt('..._common', 'mantidqt.widgets.workspacewidget',
'WorkspaceTreeWidgetSimple')
--
GitLab