mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-16 07:55:41 +00:00
635a7d77dd
This commit allows compiling LyX with Qt6 when using autotools. For a successful compilation the following 2 conditions must be met. 1) The Qt6 qmake has to come first in PATH, so that the command "qmake -v | grep -o 'Qt version .'" returns "Qt version 6". 2) The --enable-qt6 switch has to be passed to the configure command. If --enable-qt6 is used but Qt6 is not found, Qt5 is tried as a fallback. If also Qt5 is not found, configuring for Qt4 is attempted. If --enable-qt6 is not used, then things go as usual. This means that Qt5 is tried first and then Qt4, unless --disable-qt5 is used, in which case Qt4 is directly attempted. This means that existing scripts should continue working unmodified. LyX should compile with Qt6 on windows and linux, and possibly also on mac, but I could not test that. However, it is not guaranteed that it works as it should. In particular I am not sure that I got right the conversion from QRegExp to QRegularExpression. For sure, the syntax highlighting seems to not work right. Someone in the know should take a look at that. I am able to load documents and compile them but some thourough testing is needed. However, when compiling for Qt5 or Qt4, I tried to make sure that the functionality is preserved.
65 lines
785 B
C++
65 lines
785 B
C++
/**
|
|
* \file mutex.cpp
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Peter Kümmel
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "support/mutex.h"
|
|
|
|
#include <QMutex>
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
struct Mutex::Private
|
|
{
|
|
#if QT_VERSION < 0x060000
|
|
// QMutex::Recursive: less risks for dead-locks
|
|
Private() : qmutex_(QMutex::Recursive)
|
|
{
|
|
}
|
|
|
|
QMutex qmutex_;
|
|
#else
|
|
Private() : qmutex_()
|
|
{
|
|
}
|
|
|
|
QRecursiveMutex qmutex_;
|
|
#endif
|
|
};
|
|
|
|
|
|
Mutex::Mutex() : d(new Private)
|
|
{
|
|
}
|
|
|
|
|
|
Mutex::~Mutex()
|
|
{
|
|
delete d;
|
|
}
|
|
|
|
|
|
Mutex::Locker::Locker(Mutex* mtx) : mutex_(mtx)
|
|
{
|
|
mutex_->d->qmutex_.lock();
|
|
}
|
|
|
|
|
|
Mutex::Locker::~Locker()
|
|
{
|
|
mutex_->d->qmutex_.unlock();
|
|
}
|
|
|
|
|
|
|
|
} // namespace lyx
|