-
-
Notifications
You must be signed in to change notification settings - Fork 54
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
Use Qt 5.12.3 to work around macOS issues #56
Conversation
Conflicts: hifi_qt.py
// | ||
// Distributed under the Apache License, Version 2.0. | ||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | ||
// | ||
#include "TestCreator.h" | ||
|
||
#include <assert.h> | ||
#include "../../../libraries/shared/src/QtCompatibility.h" |
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.
There must be a better way of handling this.
Here are some builds you may use for testing: macOS-10.15, full self-hosted_debian-11_aarch64, full
ubuntu-18.04, full
windows-2019, full |
DrFran reports this running on macOS Monterey |
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.
I checked the changes and everything looks fine in my opinion.
I only have two questions:
Should libraries/avatars/src/AvatarData.h
be empty?
Does libraries/networking/src/udt/SendQueue.h
need #include "QtCompatibility.h"
What happened here is that this was changed and then changed back. I assume it only shows in the diff because some end-line character changed or something.
Technically it only requires QtCompatibility.h on Qt versions lower than 5.15 because of "Q_DISABLE_COPY_MOVE" |
Here are some builds you may use for testing: macOS-10.15, full ubuntu-18.04, full
windows-2019, full self-hosted_debian-11_aarch64, full |
It was just tested on M1 Mac Studio with Mac OS Monterey 12.3.1 and it works. |
It's more hard coded than it should be. |
It crashes on MacOS High Sierra 10.13.6 |
The only clue I get from the log is that it stops logging very close to where the hifi.gl and hifi.gpu.gl should start logging. I don't personally see a reason why this shouldn't run on High Sierra. Maybe something prebuilt like crashpad or webrtc is built for newer versions of macOS, but I don't see a warning indicating that. |
Putting back into work in progress due to the crashing on MacOS High Sierra 10.13.6 |
This PR works around the issues we are experiencing when mixing macOSXSDK10.12 with Qt 5.15.2.
It is a continuation of PR vircadia/vircadia-native-core#1558
This has been CR'd up to 92907bd by @akamicah