Return correct OS version on iOS#3360
Conversation
ann0see
force-pushed
the
iOS/FixGetOs
branch
3 times, most recently
from
9617fbd to
2c7f06a
Compare
Is checking the GitHub build done now? |
| @@ -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
left a comment
softins
left a comment
There was a problem hiding this comment.
The MacOS Legacy artifact shows MacOS correctly. I can't test the iOS build, but the code looks sensible, and I'm happy to approve.
ann0see
force-pushed
the
iOS/FixGetOs
branch
from
6e74fb9 to
8e8b126
Compare
pljones
left a comment
pljones
left a comment
There was a problem hiding this comment.
Not sure I like the "or" approach - but it should be okay. (And Android is barely supported...)
|
It's what I see throughout the code... |
3 participants
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