mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
Almost fix 'make check'. The only remaining problem is an undefined
reference to lyx::utf8ToUcs4. I did not fix this since it is an interface violation that should be fixed otherwise. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17358 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
2655d46b03
commit
8765ab59cd
@ -39,7 +39,6 @@ src/frontends/qt4/Alert_pimpl.C
|
||||
src/frontends/qt4/BulletsModule.C
|
||||
src/frontends/qt4/Dialogs.C
|
||||
src/frontends/qt4/FileDialog.C
|
||||
src/frontends/qt4/GuiApplication.C
|
||||
src/frontends/qt4/GuiView.C
|
||||
src/frontends/qt4/GuiWorkArea.C
|
||||
src/frontends/qt4/QAbout.C
|
||||
@ -92,6 +91,7 @@ src/insets/insetbox.C
|
||||
src/insets/insetbranch.C
|
||||
src/insets/insetcaption.C
|
||||
src/insets/insetcharstyle.C
|
||||
src/insets/insetcommand.C
|
||||
src/insets/insetenv.C
|
||||
src/insets/insetert.C
|
||||
src/insets/insetexternal.C
|
||||
|
@ -14,9 +14,11 @@ check_PROGRAMS = \
|
||||
filetools \
|
||||
lstrings
|
||||
|
||||
AM_CPPFLAGS += $(BOOST_INCLUDES)
|
||||
AM_CPPFLAGS += $(BOOST_INCLUDES) -I$(srcdir)/../..
|
||||
|
||||
convert_LDADD = ../convert.o
|
||||
|
||||
convert_LDADD = ../../debug.o ../convert.o ../docstring.o ../lstrings.o ../unicode.o ../qstring_helpers.o $(BOOST_REGEX) $(QT4_CORE_LIB)
|
||||
convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||
convert_SOURCES = \
|
||||
convert.C \
|
||||
boost.C
|
||||
@ -26,7 +28,8 @@ filetools_SOURCES = \
|
||||
filetools.C \
|
||||
boost.C
|
||||
|
||||
lstrings_LDADD = ../lstrings.o
|
||||
lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
|
||||
lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
|
||||
lstrings_SOURCES = \
|
||||
lstrings.C \
|
||||
boost.C
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "../convert.h"
|
||||
#include "../docstring.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -8,6 +9,12 @@ using lyx::convert;
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
namespace lyx {
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
|
||||
void convert_int()
|
||||
{
|
||||
cout << convert<int>("123") << '\n'
|
||||
|
@ -7,9 +7,8 @@ using namespace lyx::support;
|
||||
|
||||
using namespace std;
|
||||
|
||||
string _(string const & str)
|
||||
{
|
||||
return str;
|
||||
namespace lyx {
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
void test_normalizePath()
|
||||
|
@ -7,6 +7,10 @@ using namespace lyx::support;
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace lyx {
|
||||
docstring const _(string const & s) { return from_ascii(s); }
|
||||
}
|
||||
|
||||
void test_lowercase()
|
||||
{
|
||||
cout << lowercase('A') << endl;
|
||||
|
Loading…
Reference in New Issue
Block a user