anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merged build for some gcc 4.4.3

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34992 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-21 04:59:05 +00:00
parent 1a3c617d99
commit 0a260084df
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/GuiCharacter.cpp
View File

@ -344,7 +344,7 @@ void GuiCharacter::applyView()
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();

10
src/frontends/qt4/GuiHyperlink.cpp
View File

@ -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 {