Package const & package()
{
- LASSERT(initialised_, /**/);
+ LAPPERR(initialised_);
return package_;
}
system_support_dir_ =
get_system_support_dir(abs_binary,
command_line_system_support_dir);
- }
+ }
// Find the LyX executable
lyx_binary_ = findLyxBinary(abs_binary);
FileName const configure_script(addName(system_support().absFileName(), "configure.py"));
configure_command_ = os::python() + ' ' +
quoteName(configure_script.toFilesystemEncoding(), quote_python) +
- with_version_suffix();
+ with_version_suffix() + " --binary-dir=" + binary_dir().absFileName();
LYXERR(Debug::INIT, "<package>\n"
<< "\tbinary_dir " << binary_dir().absFileName() << '\n'
(void)home_dir; // Silence warning about unused variable.
os::GetFolderPath win32_folder_path;
return FileName(win32_folder_path(os::GetFolderPath::PERSONAL));
+#elif defined (USE_MACOSX_PACKAGING) && (QT_VERSION >= 0x050000)
+ (void)home_dir; // Silence warning about unused variable.
+ return FileName(fromqstr(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)));
#elif defined (USE_MACOSX_PACKAGING)
(void)home_dir; // Silence warning about unused variable.
return FileName(fromqstr(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation)));
os::GetFolderPath win32_folder_path;
return FileName(addPath(win32_folder_path(os::GetFolderPath::APPDATA), PACKAGE));
+#elif defined (USE_MACOSX_PACKAGING) && (QT_VERSION >= 0x050000)
+ (void)home_dir; // Silence warning about unused variable.
+ return FileName(addPath(fromqstr(QStandardPaths::writableLocation(QStandardPaths::DataLocation)), PACKAGE));
+
#elif defined (USE_MACOSX_PACKAGING)
(void)home_dir; // Silence warning about unused variable.
return FileName(addPath(fromqstr(QDesktopServices::storageLocation(QDesktopServices::DataLocation)), PACKAGE));