Skip to content

Commit

Permalink
Re #6630. Beefed up location of qt assistant.
Browse files Browse the repository at this point in the history
  • Loading branch information
peterfpeterson committed Mar 5, 2013
1 parent 5758fa0 commit 8eb9cb2
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion Code/Mantid/MantidPlot/src/HelpWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,30 @@ void HelpWindow::determineFileLocs()

// location for qtassistant
#ifdef __linux__
// linux it is in system location
// linux it is in system locations
m_assistantExe = "/usr/bin/assistant";
if (!Poco::File(m_assistantExe).exists())
{
m_log.debug() << "File \"" << m_assistantExe << "\" does not exist\n";
m_assistantExe = "/usr/bin/assistant";
if (!Poco::File(m_assistantExe).exists())
{
m_log.debug() << "File \"" << m_assistantExe
<< "\" does not exist. Assuming it is elsewhere in the path.\n";
m_assistantExe = "assistant";
}
}
m_assistantExe = "/usr/bin/assistant";
#else
// windows it is next to MantidPlot
m_assistantExe = Poco::Path(binDir, "assistant").absolute().toString();
if (!Poco::File(m_assistantExe).exists())
{
m_log.debug() << "File \"" << m_assistantExe << "\" does not exist\n";
}
#endif
if (Poco::File(m_assistantExe).exists())
m_log.debug() << "Using \"" << m_assistantExe << "\" for viewing help\n";

// determine cache file location
m_cacheFile = "mantid.qhc";
Expand Down

0 comments on commit 8eb9cb2

Please sign in to comment.