From: Peter Kümmel <syntheticpp@gmx.net>
Date: Sun, 18 Jul 2010 21:23:26 +0000 (+0000)
Subject: merged build: macro name has changed
X-Git-Tag: 2.0.0~2924
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=815ec52ab82f01f53f93fcefe9f3a7e8968b25a8;p=features.git

merged build: macro name has changed

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34981 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index d2f70297ee..28a77ecb0c 100644
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -21,7 +21,7 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#if defined(LYX_MERGED_BUILD) && !defined(Q_CC_MSVC)
+#if defined(LYX_MERGE_FILES) && !defined(Q_CC_MSVC)
 // GCC couldn't find operator==
 namespace lyx {
 	bool operator==(lyx::docstring const & d, char const * c);