Return correct OS version on iOS #3360
Merged
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
ann0see
force-pushed
the
iOS/FixGetOs
branch
3 times, most recently
from
9617fbd
to
2c7f06a
Compare
Is checking the GitHub build done now? |
pljones
reviewed
Sep 22, 2024
| @@ -1098,8 +1098,10 @@ class COSUtil | |||
| { | |||
| #ifdef _WIN32 | |||
There was a problem hiding this comment.
Are the Windows and Android ones okay? Is the Q_ a "Qt" thing that we can use for all platforms? What's the OT_ thing?
There was a problem hiding this comment.
Windows and android are ok, but probably worth changing to the Qt style.
There was a problem hiding this comment.
It seems as if we don't use Q_OS_WIN anywhere. Android is now in the same style as used in other places.
I‘ll need to re check. |
|
Ok. The GitHub build works as expected. |
ann0see
force-pushed
the
iOS/FixGetOs
branch
from
2c7f06a
to
6e74fb9
Compare
softins
approved these changes
Sep 22, 2024
pljones
approved these changes
Sep 22, 2024
ann0see
force-pushed
the
iOS/FixGetOs
branch
from
6e74fb9
to
8e8b126
Compare
pljones
approved these changes
Sep 22, 2024
|
It's what I see throughout the code... |
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.
Short description of changes
Returns correct OS version for iOS servers.
CHANGELOG: iOS: Return correct operating system version if run as server
Context: Fixes an issue?
Fixes: #3359
Does this change need documentation? What needs to be documented and how?
No
Status of this Pull Request
Review
What is missing until this pull request can be merged?
Tested on macOS and iOS, but I want to test the GitHub produced macOS build too.
Checklist