mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
Patch from Enrico:
Avoids the crash when quitting LyX on Cygwin/qt4 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14860 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
02f51e1820
commit
b486b53f8f
@ -118,6 +118,10 @@ AC_DEFUN([QT4_DO_IT_ALL],
|
|||||||
QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
|
QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
|
||||||
case ${host} in
|
case ${host} in
|
||||||
*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
|
*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
|
||||||
|
*cygwin*)
|
||||||
|
if test "x$with_x" = xno ; then
|
||||||
|
QT4_CPPFLAGS="$QT4_CPPFLAGS -DQ_CYGWIN_WIN"
|
||||||
|
fi;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST(QT4_CPPFLAGS)
|
AC_SUBST(QT4_CPPFLAGS)
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ int exec(int & argc, char * argv[])
|
|||||||
// Force adding of font path _before_ QApplication is initialized
|
// Force adding of font path _before_ QApplication is initialized
|
||||||
FontLoader::initFontPath();
|
FontLoader::initFontPath();
|
||||||
|
|
||||||
#ifdef Q_WS_WIN
|
#if defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN)
|
||||||
static Application app(argc, argv);
|
static Application app(argc, argv);
|
||||||
#else
|
#else
|
||||||
Application app(argc, argv);
|
Application app(argc, argv);
|
||||||
|
Loading…
Reference in New Issue
Block a user