Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Return correct OS version on iOS #3360

Merged
merged 1 commit into from
Sep 22, 2024
Merged

Return correct OS version on iOS #3360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,9 +1098,11 @@ class COSUtil
{
#ifdef _WIN32
Copy link
Collaborator

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?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the enum above

Copy link
Member Author

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.

Copy link
Member Author

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.

return OT_WINDOWS;
#elif defined( __APPLE__ ) || defined( __MACOSX )
#elif defined( Q_OS_MACOS )
return OT_MAC_OS;
#elif defined( ANDROID )
#elif defined( Q_OS_IOS )
return OT_I_OS;
#elif defined( Q_OS_ANDROID ) || defined( ANDROID )
return OT_ANDROID;
#else
return OT_LINUX;
Expand Down
Loading