-
Notifications
You must be signed in to change notification settings - Fork 238
Return correct OS version on iOS #3360
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
Conversation
9617fbd to
2c7f06a
Compare
Is checking the GitHub build done now? |
|
|
||
| static EOpSystemType GetOperatingSystem() | ||
| { | ||
| #ifdef _WIN32 |
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.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check the enum above
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.
Windows and android are ok, but probably worth changing to the Qt style.
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.
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. |
2c7f06a to
6e74fb9
Compare
softins
left a comment
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.
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.
6e74fb9 to
8e8b126
Compare
pljones
left a comment
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.
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... |
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