From 8f00970bf4da17ff5ac43d679ffdeafc7ab38a87 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Sun, 17 Jul 2005 23:40:08 +0000 Subject: [PATCH] compile the Qt frontend without STL compatibility stuff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10303 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 4 ++++ config/qt.m4 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index de424788d2..1770590083 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2005-07-18 Jean-Marc Lasgouttes + + * qt.m4 (QT_DO_IT_ALL): define QT_NO_STL. + 2005-07-18 Lars Gullik Bjønnes * lyxinclude.m4 (enable-optimization): make releases and diff --git a/config/qt.m4 b/config/qt.m4 index 81df41cbd4..bb0270cf41 100644 --- a/config/qt.m4 +++ b/config/qt.m4 @@ -237,9 +237,9 @@ AC_DEFUN([QT_DO_IT_ALL], AC_SUBST(QT_LDFLAGS) dnl Preprocessor flags + QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL" case ${host} in - *mingw*) QT_CPPFLAGS="-DQT_DLL -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";; - *) QT_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR";; + *mingw*) QT_CPPFLAGS="-DQT_DLL $QT_CPPFLAGS";; esac AC_SUBST(QT_CPPFLAGS)