mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-06 01:15:24 +00:00
Squash the Qt "Mutex destroy failure" warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10171 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
03087925a4
commit
78cf88d72d
@ -1,3 +1,8 @@
|
||||
2005-07-12 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* qt.m4 (QT_CHECK_IS_MULTITHREADED): ascertain whether the Qt library
|
||||
has multi-threading support.
|
||||
|
||||
2005-07-12 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac: mark the QTDIR variable as precious.
|
||||
@ -43,7 +48,7 @@
|
||||
* configure.in:
|
||||
* configure.ac: when testing for AikSaurus, do not require libbz2.
|
||||
|
||||
* relyx_configure.in:
|
||||
* relyx_configure.in:
|
||||
* relyx_configure.ac: use RELYX_USE_PACKAGING as in main configure.
|
||||
|
||||
* lyxinclude.m4 (LYX_USE_PACKAGING): remove single quotes around
|
||||
@ -60,21 +65,21 @@
|
||||
|
||||
2005-01-21 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in:
|
||||
* configure.in:
|
||||
* configure.ac: indicate in final info whether aiksaurus is used.
|
||||
|
||||
2005-01-12 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* mkinstalldirs: take a newer version from HEAD.
|
||||
|
||||
* relyx_configure.in:
|
||||
* relyx_configure.in:
|
||||
* relyx_configure.ac: make sure the prefix is correctly quoted.
|
||||
|
||||
* lyxinclude.m4: fix default win32 prefix.
|
||||
|
||||
2005-01-06 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac:
|
||||
* configure.ac:
|
||||
* configure.in: use LYX_USE_PACKAGING
|
||||
|
||||
* lyxinclude.m4 (LYX_USE_PACKAGING): new macro.
|
||||
@ -102,17 +107,17 @@
|
||||
|
||||
2004-10-06 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): back to 1.3.6cvs
|
||||
|
||||
2004-10-05 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): set to 1.3.5
|
||||
|
||||
2004-09-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in:
|
||||
* configure.in:
|
||||
* configure.ac: remove variable RPM_FRONTEND_DEPS
|
||||
|
||||
2004-03-01 Zvezdan Petkovic <zvezdan@cs.wm.edu>
|
||||
@ -122,27 +127,27 @@
|
||||
|
||||
2004-02-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): back to cvs work
|
||||
|
||||
2004-02-18 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): set version to 1.3.4
|
||||
|
||||
2003-12-30 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac (ALL_LINGUAS):
|
||||
* configure.ac (ALL_LINGUAS):
|
||||
* configure.in (ALL_LINGUAS): remove poorly supported languages
|
||||
|
||||
2003-09-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): back to cvs work
|
||||
|
||||
2003-09-25 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac: set version to 1.3.3
|
||||
|
||||
2003-07-22 John Levon <levon@movementarian.org>
|
||||
@ -169,12 +174,12 @@
|
||||
|
||||
2003-05-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* relyx_configure.ac:
|
||||
* relyx_configure.ac:
|
||||
* relyx_configure.in: add AM_MAINTAINER_MODE here too.
|
||||
|
||||
2003-05-06 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (VERSION):
|
||||
* configure.in (VERSION):
|
||||
* configure.ac (VERSION): back to 1.3.3cvs
|
||||
|
||||
2003-05-06 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
@ -183,17 +188,17 @@
|
||||
|
||||
2003-04-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in (ALL_LINGUAS):
|
||||
* configure.in (ALL_LINGUAS):
|
||||
* configure.ac (ALL_LINGUAS): add nn (nynorsk)
|
||||
|
||||
2003-04-01 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in:
|
||||
* configure.in:
|
||||
* configure.ac: move AM_MAINTAINER_MODE later
|
||||
|
||||
2003-03-12 Kayvan Sylvan <kayvan@sylvan.com>
|
||||
|
||||
* configure.ac:
|
||||
* configure.ac:
|
||||
* configure.in: Add the CHECK_WITH_CYGWIN macro call.
|
||||
|
||||
* Makefile.am: add cygwin.m4 to EXTRA_DIST
|
||||
@ -206,7 +211,7 @@
|
||||
|
||||
2003-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.in:
|
||||
* configure.in:
|
||||
* configure.ac: use AM_MAINTAINER_MODE
|
||||
|
||||
2003-03-20 Kayvan Sylvan <kayvan@sylvan.com>
|
||||
@ -218,17 +223,17 @@
|
||||
|
||||
2003-03-19 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac (VERSION):
|
||||
* configure.ac (VERSION):
|
||||
* configure.in (VERSION): back to 1.3.2cvs
|
||||
|
||||
2003-03-17 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac (VERSION):
|
||||
* configure.ac (VERSION):
|
||||
* configure.in (VERSION): update for 1.3.1
|
||||
|
||||
2003-03-10 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac:
|
||||
* configure.ac:
|
||||
* configure.in: remove special handling of linking order for
|
||||
cygwin
|
||||
|
||||
@ -246,17 +251,17 @@
|
||||
2003-02-18 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* Makefile.am (EXTRA_DIST): add pkg.m4, relyx_configure.ac and
|
||||
relyx_configure.in.
|
||||
relyx_configure.in.
|
||||
|
||||
2003-02-07 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* configure.ac:
|
||||
* configure.ac:
|
||||
* configure.in (VERSION): change version to 1.3.1cvs
|
||||
|
||||
2003-01-12 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||
|
||||
* xforms.m4 (LYX_CHECK_XFORMS_IMAGE_LOADER): include forms.h in
|
||||
the prog that checks for flimage.h header.
|
||||
the prog that checks for flimage.h header.
|
||||
|
||||
* common.am (AM_INSTALL_DATA_FLAGS): add
|
||||
|
||||
|
36
config/qt.m4
36
config/qt.m4
@ -156,6 +156,40 @@ EOF
|
||||
AC_SUBST(QT_VERSION)
|
||||
])
|
||||
|
||||
dnl Ascertain whether the Qt libraries are multi-threaded or not
|
||||
AC_DEFUN([QT_CHECK_IS_MULTITHREADED],
|
||||
[
|
||||
AC_CACHE_CHECK([whether the Qt library is multi-threaded],
|
||||
qt_cv_is_multithreaded,
|
||||
[
|
||||
AC_LANG_CPLUSPLUS
|
||||
SAVE_CXXFLAGS=$CXXFLAGS
|
||||
SAVE_LIBS="$LIBS"
|
||||
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
|
||||
LIBS="$LIBS $QT_LIB"
|
||||
|
||||
AC_TRY_LINK(
|
||||
[
|
||||
#define QT_THREAD_SUPPORT
|
||||
#include <qapplication.h>
|
||||
],
|
||||
[
|
||||
QApplication a(0,0);
|
||||
a.unlock();
|
||||
],
|
||||
qt_cv_is_multithreaded=yes,
|
||||
qt_cv_is_multithreaded=no
|
||||
)
|
||||
|
||||
LIBS="$SAVE_LIBS"
|
||||
CXXFLAGS=$SAVE_CXXFLAGS
|
||||
])
|
||||
|
||||
if test x"$qt_cv_is_multithreaded" = xyes; then
|
||||
QT_CPPFLAGS="$QT_CPPFLAGS -DQT_THREAD_SUPPORT"
|
||||
fi
|
||||
])
|
||||
|
||||
dnl start here
|
||||
AC_DEFUN([QT_DO_IT_ALL],
|
||||
[
|
||||
@ -222,6 +256,8 @@ AC_DEFUN([QT_DO_IT_ALL],
|
||||
QT_LIB=$qt_cv_libname;
|
||||
AC_SUBST(QT_LIB)
|
||||
|
||||
QT_CHECK_IS_MULTITHREADED
|
||||
|
||||
if test -n "$qt_cv_libname"; then
|
||||
QT_GET_VERSION
|
||||
fi
|
||||
|
@ -1,3 +1,8 @@
|
||||
2005-07-12 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* lyx_gui.C (LQApplication d-tor): unlock the mutex if the Qt library
|
||||
is multi-threaded.
|
||||
|
||||
2005-06-16 Joao Luis Meloni Assirati <assirati@nonada.if.usp.br>
|
||||
|
||||
* QMathDialog.C (QMathDialog, insertFont): add boldsymbol font.
|
||||
@ -36,7 +41,7 @@
|
||||
2005-05-24 Angus Leeming <leeming@lyx.org>
|
||||
|
||||
* QExternalDialog.C (browseClicked):
|
||||
* QBibtexDialog.C (browsePressed, browseBibPressed):
|
||||
* QBibtexDialog.C (browsePressed, browseBibPressed):
|
||||
* QLPrintDialog.C (browseClicked):
|
||||
backport 1.4.x code to use the controller's browse member function
|
||||
rather than QFileDialog::getOpenFileName
|
||||
|
@ -92,7 +92,7 @@ extern bool lyxX11EventFilter(XEvent * xev);
|
||||
#ifdef Q_OS_MAC
|
||||
extern bool macEventFilter(EventRef event);
|
||||
extern pascal OSErr
|
||||
handleOpenDocuments(const AppleEvent* inEvent, AppleEvent* /*reply*/,
|
||||
handleOpenDocuments(const AppleEvent* inEvent, AppleEvent* /*reply*/,
|
||||
long /*refCon*/);
|
||||
#endif
|
||||
|
||||
@ -121,17 +121,22 @@ LQApplication::LQApplication(int & argc, char ** argv)
|
||||
|
||||
|
||||
LQApplication::~LQApplication()
|
||||
{}
|
||||
{
|
||||
#ifdef QT_THREAD_SUPPORT
|
||||
if (locked())
|
||||
unlock();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
bool LQApplication::macEventFilter(EventRef event)
|
||||
bool LQApplication::macEventFilter(EventRef event)
|
||||
{
|
||||
if (GetEventClass(event) == kEventClassAppleEvent) {
|
||||
EventRecord eventrec;
|
||||
ConvertEventRefToEventRecord(event, &eventrec);
|
||||
AEProcessAppleEvent(&eventrec);
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
@ -143,7 +148,7 @@ void lyx_gui::parse_init(int & argc, char * argv[])
|
||||
{
|
||||
// Force adding of font path _before_ QApplication is initialized
|
||||
qfont_loader::initFontPath();
|
||||
|
||||
|
||||
static LQApplication app(argc, argv);
|
||||
|
||||
#if QT_VERSION >= 0x030200
|
||||
@ -232,7 +237,7 @@ void lyx_gui::exit()
|
||||
// into a static dialog return in the lyx code (for example,
|
||||
// load autosave file QMessageBox. We have to just get the hell
|
||||
// out.
|
||||
|
||||
|
||||
::exit(0);
|
||||
}
|
||||
|
||||
|
@ -133,6 +133,9 @@ What's new
|
||||
- Enable the file browser to return a "file name with spaces" to the
|
||||
appropriate dialog if LaTeX can handle such files.
|
||||
|
||||
- Squash the "Mutex destroy failure" warning when shutting down LyX [Qt only].
|
||||
Prevents a core dump on NetBSD.
|
||||
|
||||
* User Interface:
|
||||
|
||||
- Fix crash when using math-mutate with invalid argument.
|
||||
|
Loading…
Reference in New Issue
Block a user