From 65135568679007c6fdd222f1b0cd22e353bf3720 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Mon, 8 Nov 2010 00:37:58 +0000 Subject: [PATCH] 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 --- src/frontends/qt4/GuiView.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index eaec019d95..23e9b5e451 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -129,6 +129,7 @@ # include #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 -- 2.39.2