From 7f09a8b58bd9a48a2d9b8b8291fa633449a03379 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Fri, 23 Apr 2010 13:20:28 +0000 Subject: [PATCH] cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker error on win32 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34283 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiHyperlink.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp index 75d93cd8ea..d2f70297ee 100644 --- a/src/frontends/qt4/GuiHyperlink.cpp +++ b/src/frontends/qt4/GuiHyperlink.cpp @@ -21,12 +21,12 @@ #include #include -#ifdef LYX_MERGED_BUILD +#if defined(LYX_MERGED_BUILD) && !defined(Q_CC_MSVC) // GCC couldn't find operator== namespace lyx { - bool operator==(lyx::docstring & d, char const * c); + bool operator==(lyx::docstring const & d, char const * c); namespace frontend { - bool operator==(lyx::docstring & d, char const * c) + bool operator==(lyx::docstring const & d, char const * c) { return lyx::operator ==(d, c); } } } -- 2.39.2