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 d2f70297ee18a2cc333ec83e6bd865a5c4862732..28a77ecb0c9cb3a85d010848414aff7f0536c763 100644 (file)
--- 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);