mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
fix linker errors when using Qt 4.2
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36205 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b91d09daf6
commit
6513556867
@ -129,6 +129,7 @@
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
|
||||
using namespace std;
|
||||
using namespace lyx::support;
|
||||
|
||||
@ -2886,7 +2887,6 @@ docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer
|
||||
{
|
||||
bool (Buffer::* mem_func)(std::string const &, bool, bool) const = &Buffer::doExport;
|
||||
return runAndDestroy(bind(mem_func, buffer, _1, false, _2), orig, buffer, format, "export");
|
||||
|
||||
}
|
||||
|
||||
docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
|
||||
@ -2894,6 +2894,26 @@ docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer
|
||||
bool(Buffer::* mem_func)(std::string const &, bool) const = &Buffer::preview;
|
||||
return runAndDestroy(bind(mem_func, buffer, _1, _2), orig, buffer, format, "preview");
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
// not used, but the linker needs them
|
||||
|
||||
docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
|
||||
{
|
||||
return docstring();
|
||||
}
|
||||
|
||||
docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
|
||||
{
|
||||
return docstring();
|
||||
}
|
||||
|
||||
docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
|
||||
{
|
||||
return docstring();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user