Author: kuemmel
Date: Wed Jul 21 06:59:05 2010
New Revision: 34992
URL: http://www.lyx.org/trac/changeset/34992
Log:
fix merged build for some gcc 4.4.3
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiCharacter.cpp
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiHyperlink.cpp
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiCharacter.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiCharacter.cpp Tue Jul
20 21:45:36 2010 (r34991)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiCharacter.cpp Wed Jul
21 06:59:05 2010 (r34992)
@@ -344,7 +344,7 @@
setBar(fi, bar[miscCO->currentIndex()].second);
fi.setColor(color[colorCO->currentIndex()].second);
- font_.setLanguage(languages.getLanguage(
+ font_.setLanguage(lyx::languages.getLanguage(
fromqstr(language[langCO->currentIndex()].second)));
toggleall_ = toggleallCB->isChecked();
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiHyperlink.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiHyperlink.cpp Tue Jul
20 21:45:36 2010 (r34991)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiHyperlink.cpp Wed Jul
21 06:59:05 2010 (r34992)
@@ -21,6 +21,16 @@
#include <QLineEdit>
#include <QPushButton>
+#if defined(LYX_MERGE_FILES) && !defined(Q_CC_MSVC)
+// GCC 4.4.3 couldn't find operator==
+namespace lyx {
+ bool operator==(lyx::docstring const & d, char const * c);
+ namespace frontend {
+ bool operator==(lyx::docstring const & d, char const * c)
+ { return lyx::operator ==(d, c); }
+ }
+}
+#endif
namespace lyx {
namespace frontend {
