Fixup build with qt6 #3
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pvuorela
reviewed
Dec 21, 2022
resourceqt-client/client.cpp
Outdated
| @@ -29,6 +29,12 @@ USA. | |||
|
|
|||
| #include "client.h" | |||
|
|
|||
| #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) | |||
| @@ -35,7 +36,11 @@ ResourceSet::ResourceSet(const QString &applicationClass, QObject * parent, | |||
| audioResource(NULL), autoRelease(initialAutoRelease), | |||
| alwaysReply(initialAlwaysReply), initialized(false), pendingAcquire(false), | |||
| pendingUpdate(false), pendingAudioProperties(false), pendingVideoProperties(false), | |||
| #if (QT_VERSION > QT_VERSION_CHECK(6,0,0)) | |||
| inAcquireMode(false), reqMutex(QRecursiveMutex()), ignoreQ(false) | |||
| #else | |||
There was a problem hiding this comment.
Please just include the differing variables inside #if. inAcquireMode and ignoreQ don't need differences so could be taken out of here. Also the default ctor for the QRecursiveMutex could be skipped.
-> could just have "if < 5.14" without else branch.
Same on the other ctor.
| QMutexLocker locker(&mutex); | ||
| #else | ||
| mutex.lock(); |
There was a problem hiding this comment.
Not following why this change? Different behavior too, nothing releases the mutex when the function is exited? Doesn't feel proper.
pvuorela
requested changes
Nov 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.