Let paragraph::requestSpellcheck() consider contained insets

[lyx.git] / src / support / mutex.cpp

diff --git a/src/support/mutex.cpp b/src/support/mutex.cpp
index 042c9b88cd172fe54110b30c782a11752b469601..89ee2b8e235374b747c2a9761a0b7714f50fe200 100644 (file)
--- a/src/support/mutex.cpp
+++ b/src/support/mutex.cpp
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "mutex.h"
+#include "support/mutex.h"
 
 #include <QMutex>
 
@@ -20,12 +20,20 @@ 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
 };
 
 
@@ -40,22 +48,6 @@ Mutex::~Mutex()
 }
 
 
-// It makes no sense to copy the mutex,
-// each instance has its own QMutex,
-// therefore nothing to copy!
-// TODO review
-Mutex::Mutex(const Mutex&) : d(new Private)
-{
-}
-
-
-Mutex& Mutex::operator=(const Mutex&)
-{
-       return *this;
-}
-
-
-
 Mutex::Locker::Locker(Mutex* mtx) : mutex_(mtx)
 {
        mutex_->d->qmutex_.lock();