-
Notifications
You must be signed in to change notification settings - Fork 452
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.
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
Replace deprecated QMutex(Recursive) with QRecursiveMutex #1413
Conversation
Only since Qt 5.14 and we still need to be able to compile for Qt 5.12 so this is a breaking change Edit: However in this particular case: https://ci.appveyor.com/project/f4exb/sdrangel/builds/44793291/job/cch929rlsxpa6pcu we are with Qt 5.15 so the error is somewhere else |
Note that the main thing holding us back to Ubuntu 20.04 and therefore Qt 5.12.8 is the Appveyor image for CI. However it seems possible to use Qt 5.15.2 inside this image but this needs some investigation and it is not ready right now. |
@@ -34,7 +34,6 @@ SigMFFileSinkBaseband::SigMFFileSinkBaseband() : | |||
m_specMax(0), | |||
m_squelchLevel(0), | |||
m_squelchOpen(false), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra comma here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thx, fidex
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But the ../logging/logger.h:13:10: fatal error: QRecursiveMutex: No such file or directory
is probably issue with Qt 5.12
right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that the main thing holding us back to Ubuntu 20.04 and therefore Qt 5.12.8 is the Appveyor image for CI. However it seems possible to use Qt 5.15.2 inside this image but this needs some investigation and it is not ready right now.
What do you suggest, I can hold till the Qt version issue is resolved. Should I close this MR for now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed we will not try to make it work for Qt 5.12 and also later versions with #define(s). So in any case it should wait for Qt upgrade whether it remains open and unmerged or closed and submitted later. I know keeping Qt 5.12 compatibility is a pain (another PR is failing to compile because of this) and upgrade should take place one way or the other and the sooner the better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1416 opened
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now building for Ubuntu 22.04 with Qt 5.15
528730b
to
7539a0f
Compare
7539a0f
to
0df2d75
Compare
The goal here is to reduce noise during compiling.
The
QMutex m_mutex(QMutex::Recursive)
construct is deprecated and should be replaced byQRecursiveMutex
.