Skip to content

GUI - fix Qt 5.12 recursive QMutex usage #3133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samaaron merged 1 commit into from
Jul 12, 2022
Merged

GUI - fix Qt 5.12 recursive QMutex usage #3133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/gui/qt/widgets/sonicpiscintilla.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "profiler.h"
#include "sonicpiscintilla.h"
#include "dpi.h"
#include <QRecursiveMutex>
#include <QSettings>
#include <QShortcut>
#include <QDrag>
Expand All @@ -24,6 +23,9 @@
#include <Qsci/qscilexer.h>
#include <QCheckBox>
#include <QRegularExpression>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
#include <QRecursiveMutex>
#endif

SonicPiScintilla::SonicPiScintilla(SonicPiLexer *lexer, SonicPiTheme *theme, QString fileName, bool autoIndent)
: QsciScintilla()
Expand All @@ -37,7 +39,11 @@ SonicPiScintilla::SonicPiScintilla(SonicPiLexer *lexer, SonicPiTheme *theme, QSt
standardCommands()->clearAlternateKeys();
QString skey;
QSettings settings(QSettings::IniFormat, QSettings::UserScope, "sonic-pi.net", "gui-keys-bindings");
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
mutex = new QRecursiveMutex();
#else
mutex = new QMutex(QMutex::Recursive);
#endif

#if defined(Q_OS_MAC)
int SPi_CTRL = Qt::META;
Expand Down
6 changes: 6 additions & 0 deletions app/gui/qt/widgets/sonicpiscintilla.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
#include "model/sonicpitheme.h"
#include "widgets/sonicpilog.h"
#include <QCheckBox>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
#include <QRecursiveMutex>
#endif

class SonicPiLexer;
class QSettings;
Expand Down Expand Up @@ -88,7 +90,11 @@ class SonicPiScintilla : public QsciScintilla
void dragMoveEvent(QDragMoveEvent *event);
bool event(QEvent *evt);
bool autoIndent;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QRecursiveMutex *mutex;
#else
QMutex *mutex;
#endif

};

Expand Down