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.

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

Mac os old qt experiment #17

Open
wants to merge 246 commits into
base: master
Choose a base branch
from
Open

Mac os old qt experiment #17

wants to merge 246 commits into from

Conversation

JulianGro
Copy link
Owner

No description provided.

ctrlaltdavid and others added 30 commits May 20, 2021 09:43
Conditionally include WebRTCSignalingServer.h
…annel

# Conflicts:
#	domain-server/src/DomainServer.h
…update

Update webapp feature branch with current master
daleglass and others added 30 commits November 26, 2021 18:39
uniqueKeys() is deprecated, and _resources shouldn't contain duplicated keys.
…crash_GHA

Specify macOS SDK to 10.12 on GHA to solve crash when entering fullscreen.
Fix deprecated usage of multiple keys in QHash and QMap.
…-examples

Update API examples to use "vircadia" in mapping names.
Housekeeping: Update use of "auto" with plugin lists.
Housekeeping: use of std::make_shared / QSharedPointer::create.
…ch64

GHA: Disable compiler optimization on self-hosted runner.
Remove second argument from some playSystemSound() calls in QML.
This reverts commit 24b2cdf.

Conflicts:
	libraries/shared/src/shared/FileUtils.cpp
…rts""

This reverts commit 74b185f.

Conflicts:
	libraries/shared/src/shared/FileUtils.cpp
…_COPY (or Q_DISABLE_COPY_MOVE)"

This reverts commit 57a3cd3.

Conflicts:
	interface/src/avatar/MyHead.h
	libraries/networking/src/NodeList.h
… the existing code)"

This reverts commit c88b7f6.

Conflicts:
	interface/src/avatar/MyHead.h
This reverts commit aabcdea, reversing
changes made to 57167cd.

# Conflicts:
#	libraries/networking/src/NodeList.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants