Remove the use of QRecursiveMutex
This commit is contained in:
4 files changed
+4
-3
No files matched your search
@@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES(
|
||||
OPTION(USE_QTDBUS "Build with QtDBus" ON)
|
||||
OPTION(USE_FERVOR "Add Fervor support" OFF)
|
||||
OPTION(CALYP_MANAGED_RESOURCES "Handle streams in separate threads" ON)
|
||||
OPTION(CALYP_THREADED_MODULES "Use threads for modules" ON)
|
||||
|
||||
ADD_SUBDIRECTORY(external)
|
||||
|
||||
|
||||
@@ -239,6 +239,8 @@ void CalypAppModuleIf::disable()
|
||||
QApplication::setOverrideCursor( Qt::WaitCursor );
|
||||
#ifdef CALYP_THREADED_MODULES
|
||||
QMutexLocker locker( &m_Mutex );
|
||||
m_Mutex.lock();
|
||||
m_Mutex.unlock();
|
||||
#endif
|
||||
m_frameList.clear();
|
||||
m_frameListPtr.clear();
|
||||
|
||||
@@ -118,7 +118,7 @@ private:
|
||||
double m_dMeasurementResult{ 0 };
|
||||
|
||||
#ifdef CALYP_THREADED_MODULES
|
||||
QRecursiveMutex m_Mutex;
|
||||
QMutex m_Mutex;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#
|
||||
# CMakeLists for calyp modules component
|
||||
#
|
||||
|
||||
OPTION(CALYP_THREADED_MODULES "Use threads for modules" ON)
|
||||
SET(CALYP_EXTRA_MODULES_DIR
|
||||
"CALYP_EXTRA_MODULES_DIR"
|
||||
CACHE PATH "Location of extra Calyp modules"
|
||||
|
||||
Reference in new issue
Block a user