Jürgen Spitzmüller wrote:
> > this worked in 1.6.1 and is broken in 1.6.2
attached fix for the previous error (for branch).
the next problem supposedly related to last tex2lyx changes:
/bin/sh ../../libtool --tag=CXX --mode=link g++ -O2 -o tex2lyx FloatList.o
Floating.o Counters.o InsetLayout.o Layout.o TextClass.o Lexer.o lengthcommon.o
Color.o boost.o Context.o Font.o gettext.o Parser.o tex2lyx.o preamble.o math.o
table.o text.o ../../src/support/liblyxsupport.la ../../boost/liblyxboost.la
-laspell -lz
g++ -O2 -o tex2lyx FloatList.o Floating.o Counters.o InsetLayout.o Layout.o
TextClass.o Lexer.o lengthcommon.o Color.o boost.o Context.o Font.o gettext.o
Parser.o tex2lyx.o preamble.o math.o table.o text.o
../../src/support/.libs/liblyxsupport.a -L/usr/lib/qt4
/usr/lib/qt4/libQtCore.so -lm -lrt -lpthread ../../boost/.libs/liblyxboost.a
/usr/lib/libaspell.so -lgpm -ldl -lz
Parser.o: In function `lyx::Parser::setEncoding(std::basic_string<char,
std::char_traits<char>, std::allocator<char> > const&)':
Parser.cpp:(.text+0x6bb): undefined reference to `lyx::encodings'
Parser.cpp:(.text+0x6c4): undefined reference to
`lyx::Encodings::fromLaTeXName(std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&) const'
tex2lyx.o: In function `main':
tex2lyx.cpp:(.text+0x4a17): undefined reference to `lyx::encodings'
tex2lyx.cpp:(.text+0x4a1c): undefined reference to
`lyx::Encodings::read(lyx::support::FileName const&, lyx::support::FileName
const&)'
text.o: In function `lyx::parse_text(lyx::Parser&, std::basic_ostream<char,
std::char_traits<char> >&, unsigned int, bool, lyx::Context&)':
text.cpp:(.text+0x1193a): undefined reference to
`lyx::Encodings::fromLaTeXCommand(std::basic_string<wchar_t,
std::char_traits<wchar_t>, std::allocator<wchar_t> > const&,
std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>
>&)'
text.cpp:(.text+0x13bd0): undefined reference to
`lyx::Encodings::fromLaTeXCommand(std::basic_string<wchar_t,
std::char_traits<wchar_t>, std::allocator<wchar_t> > const&,
std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>
>&)'
collect2: ld returned 1 exit status
pavel
Index: src/frontends/qt4/GuiSelectionManager.cpp
===================================================================
--- src/frontends/qt4/GuiSelectionManager.cpp (revision 28990)
+++ src/frontends/qt4/GuiSelectionManager.cpp (working copy)
@@ -145,7 +145,7 @@
QModelIndexList qmil =
selectedModel->match(selectedModel->index(0),
Qt::DisplayRole, str, 1,
- Qt::MatchExactly | Qt::MatchWrap);
+ Qt::MatchFlag(Qt::MatchExactly |
Qt::MatchWrap));
return !qmil.empty();
}
