vircadia · JulianGro · Sep 27, 2020 · Dec 30, 2021 · Dec 30, 2021 · Dec 30, 2021
diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
@@ -69,6 +69,8 @@ jobs:
           echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
           echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
           echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          # Build with old Qt to work around incompatibility with newer Qt versions and macOSXSDK10.12. See https://github.com/vircadia/vircadia/issues/1516
+          echo "VIRCADIA_USE_QT_VERSION=5.12.3" >> $GITHUB_ENV
         fi
         # Windows build variables
         if [ "${{ matrix.os }}" = "windows-latest" ]; then

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -94,6 +94,8 @@ jobs:
             echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
           fi
           echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          # Build with old Qt to work around incompatibility with newer Qt versions and macOSXSDK10.12. See https://github.com/vircadia/vircadia/issues/1516
+          echo "VIRCADIA_USE_QT_VERSION=5.12.3" >> $GITHUB_ENV
         fi
         # Windows build variables
         if [ "${{ matrix.os }}" = "windows-latest" ]; then

diff --git a/BUILD_OSX.md b/BUILD_OSX.md
@@ -29,6 +29,13 @@ You will need version `10.12` of the macOS SDK for building, otherwise you may h
 cp -rp ~/Downloads/MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
 ```
 
+When using macOSXSDK10.12, you also need to use an older Qt package to avoid compatibility issues on Big Sur and newer.
+To do this, set the appropriate environment variable:
+```bash
+VIRCADIA_USE_QT_VERSION=5.12.3
+```
+ See https://github.com/vircadia/vircadia/issues/1516.
+
 ### OpenSSL
 
 Assuming you've installed OpenSSL using the homebrew instructions above, you'll need to set `OPENSSL_ROOT_DIR` so CMake can find your installations.

diff --git a/assignment-client/src/audio/AvatarAudioStream.h b/assignment-client/src/audio/AvatarAudioStream.h
@@ -23,7 +23,12 @@ class AvatarAudioStream : public PositionalAudioStream {
     AvatarAudioStream(bool isStereo, int numStaticJitterFrames = -1);
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AvatarAudioStream(const AvatarAudioStream&);
+    AvatarAudioStream& operator= (const AvatarAudioStream&);
+#else
     Q_DISABLE_COPY(AvatarAudioStream)
+#endif
 
     int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override;
 };

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -1062,7 +1062,11 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
 
     static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist";
     _slaveSharedData.skeletonURLWhitelist = avatarMixerGroupObject[AVATAR_WHITELIST_OPTION]
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        .toString().split(',', QString::KeepEmptyParts);
+#else
         .toString().split(',', Qt::KeepEmptyParts);
+#endif
 
     static const QString REPLACEMENT_AVATAR_OPTION = "replacement_avatar";
     _slaveSharedData.skeletonReplacementURL = avatarMixerGroupObject[REPLACEMENT_AVATAR_OPTION]

diff --git a/domain-server/src/NodeConnectionData.cpp b/domain-server/src/NodeConnectionData.cpp
@@ -51,12 +51,12 @@ NodeConnectionData NodeConnectionData::fromDataStream(QDataStream& dataStream, c
 
     dataStream >> newHeader.lastPingTimestamp;
 
-    SocketType publicSocketType, localSocketType;
+    quint8 publicSocketType, localSocketType;
     dataStream >> newHeader.nodeType
         >> publicSocketType >> newHeader.publicSockAddr >> localSocketType >> newHeader.localSockAddr
         >> newHeader.interestList >> newHeader.placeName;
-    newHeader.publicSockAddr.setType(publicSocketType);
-    newHeader.localSockAddr.setType(localSocketType);
+    newHeader.publicSockAddr.setType((SocketType)publicSocketType);
+    newHeader.localSockAddr.setType((SocketType)localSocketType);
 
     // For WebRTC connections, the user client's signaling channel WebSocket address is used instead of the actual data 
     // channel's address.

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
@@ -3261,12 +3261,20 @@ void Application::initializeUi() {
         auto newValidator = [=](const QUrl& url) -> bool {
             QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]";
             QList<QString> safeURLS = { "" };
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+            safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), QString::SkipEmptyParts);
+#else
             safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts);
+#endif
 
             // PULL SAFEURLS FROM INTERFACE.JSON Settings
 
             QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+            QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), QString::SkipEmptyParts);
+#else
             QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), Qt::SkipEmptyParts);
+#endif
             safeURLS += settingsSafeURLS;
 
             // END PULL SAFEURLS FROM INTERFACE.JSON Settings
@@ -8843,19 +8851,31 @@ void Application::initPlugins(const QStringList& arguments) {
     parser.parse(arguments);
 
     if (parser.isSet(display)) {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        auto preferredDisplays = parser.value(display).split(',', QString::SkipEmptyParts);
+#else
         auto preferredDisplays = parser.value(display).split(',', Qt::SkipEmptyParts);
+#endif
         qInfo() << "Setting prefered display plugins:" << preferredDisplays;
         PluginManager::getInstance()->setPreferredDisplayPlugins(preferredDisplays);
     }
 
     if (parser.isSet(disableDisplays)) {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        auto disabledDisplays = parser.value(disableDisplays).split(',', QString::SkipEmptyParts);
+#else
         auto disabledDisplays = parser.value(disableDisplays).split(',', Qt::SkipEmptyParts);
+#endif
         qInfo() << "Disabling following display plugins:"  << disabledDisplays;
         PluginManager::getInstance()->disableDisplays(disabledDisplays);
     }
 
     if (parser.isSet(disableInputs)) {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        auto disabledInputs = parser.value(disableInputs).split(',', QString::SkipEmptyParts);
+#else
         auto disabledInputs = parser.value(disableInputs).split(',', Qt::SkipEmptyParts);
+#endif
         qInfo() << "Disabling following input plugins:" << disabledInputs;
         PluginManager::getInstance()->disableInputs(disabledInputs);
     }

diff --git a/interface/src/Application.h b/interface/src/Application.h
@@ -648,7 +648,11 @@ private slots:
 
     EntityTreePointer _entityClipboard;
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    mutable QMutex _viewMutex { QMutex::Recursive };
+#else
     mutable QRecursiveMutex _viewMutex;
+#endif
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
     ViewFrustum _displayViewFrustum;
 
@@ -774,7 +778,11 @@ private slots:
     bool _isMissingSequenceNumbers { false };
 
     void checkChangeCursor();
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    mutable QMutex _changeCursorLock { QMutex::Recursive };
+#else
     mutable QRecursiveMutex _changeCursorLock;
+#endif
     Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
     bool _cursorNeedsChanging { false };
 

diff --git a/interface/src/avatar/MyHead.h b/interface/src/avatar/MyHead.h
@@ -22,7 +22,12 @@ class MyHead : public Head {
     void simulate(float deltaTime) override;
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    MyHead(const Head&);
+    MyHead& operator= (const MyHead&);
+#else
     Q_DISABLE_COPY(MyHead)
+#endif
 };
 
 #endif // hifi_MyHead_h
diff --git a/interface/src/graphics/GraphicsEngine.h b/interface/src/graphics/GraphicsEngine.h
@@ -69,7 +69,11 @@ class GraphicsEngine {
 
 protected:
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    mutable QMutex _renderArgsMutex{ QMutex::Recursive };
+#else
     mutable QRecursiveMutex _renderArgsMutex;
+#endif
     AppRenderArgs _appRenderArgs;
 
     RateCounter<500> _renderLoopCounter;

diff --git a/interface/src/ui/overlays/Overlays.h b/interface/src/ui/overlays/Overlays.h
@@ -746,7 +746,11 @@ public slots:
 private:
     void cleanupOverlaysToDelete();
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    mutable QMutex _mutex { QMutex::Recursive };
+#else
     mutable QRecursiveMutex _mutex;
+#endif
     QMap<QUuid, Overlay::Pointer> _overlays;
     QList<Overlay::Pointer> _overlaysToDelete;
 

diff --git a/libraries/animation/src/AnimNodeLoader.h b/libraries/animation/src/AnimNodeLoader.h
@@ -45,7 +45,12 @@ protected slots:
     QSharedPointer<Resource> _resource;
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AnimNodeLoader(const AnimNodeLoader&) = delete;
+    AnimNodeLoader& operator=(const AnimNodeLoader&) = delete;
+#else
     Q_DISABLE_COPY(AnimNodeLoader)
+#endif
 };
 
 #endif // hifi_AnimNodeLoader
diff --git a/libraries/animation/src/AnimRandomSwitch.h b/libraries/animation/src/AnimRandomSwitch.h
@@ -120,7 +120,12 @@ class AnimRandomSwitch : public AnimNode {
         std::vector<Transition> _transitions;
 
     private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        RandomSwitchState(const RandomSwitchState&) = delete;
+        RandomSwitchState& operator=(const RandomSwitchState&) = delete;
+#else
         Q_DISABLE_COPY(RandomSwitchState)
+#endif
     };
 
 public:
@@ -179,7 +184,12 @@ class AnimRandomSwitch : public AnimNode {
     QString _lastPlayedState;
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AnimRandomSwitch(const AnimRandomSwitch&) = delete;
+    AnimRandomSwitch& operator=(const AnimRandomSwitch&) = delete;
+#else
     Q_DISABLE_COPY(AnimRandomSwitch)
+#endif
 };
 
 #endif // hifi_AnimRandomSwitch_h
diff --git a/libraries/animation/src/AnimStateMachine.h b/libraries/animation/src/AnimStateMachine.h
@@ -107,7 +107,12 @@ class AnimStateMachine : public AnimNode {
         std::vector<Transition> _transitions;
 
     private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        State(const State&) = delete;
+        State& operator=(const State&) = delete;
+#else
         Q_DISABLE_COPY(State)
+#endif
     };
 
 public:
@@ -150,7 +155,12 @@ class AnimStateMachine : public AnimNode {
     QString _currentStateVar;
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AnimStateMachine(const AnimStateMachine&) = delete;
+    AnimStateMachine& operator=(const AnimStateMachine&) = delete;
+#else
     Q_DISABLE_COPY(AnimStateMachine)
+#endif
 };
 
 #endif // hifi_AnimStateMachine_h
diff --git a/libraries/audio/src/AudioInjectorManager.h b/libraries/audio/src/AudioInjectorManager.h
@@ -72,7 +72,12 @@ private slots:
     bool wouldExceedLimits();
 
     AudioInjectorManager() { createThread(); }
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AudioInjectorManager(const AudioInjectorManager&) = delete;
+    AudioInjectorManager& operator=(const AudioInjectorManager&) = delete;
+#else
     Q_DISABLE_COPY(AudioInjectorManager)
+#endif
 
     void createThread();
 

diff --git a/libraries/audio/src/InjectedAudioStream.h b/libraries/audio/src/InjectedAudioStream.h
@@ -28,7 +28,12 @@ class InjectedAudioStream : public PositionalAudioStream {
     virtual const QUuid& getStreamIdentifier() const override { return _streamIdentifier; }
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    InjectedAudioStream(const InjectedAudioStream&);
+    InjectedAudioStream& operator= (const InjectedAudioStream&);
+#else
     Q_DISABLE_COPY(InjectedAudioStream)
+#endif
 
     AudioStreamStats getAudioStreamStats() const override;
     int parseStreamProperties(PacketType type, const QByteArray& packetAfterSeqNum, int& numAudioSamples) override;

diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
@@ -1887,7 +1887,12 @@ public slots:
     virtual void clearAvatarGrabData(const QUuid& grabID);
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    AvatarData(const AvatarData&);
+    AvatarData& operator= (const AvatarData&);
+#else
     Q_DISABLE_COPY(AvatarData)
+#endif
 
     friend void avatarStateFromFrame(const QByteArray& frameData, AvatarData* _avatar);
     static QUrl _defaultFullAvatarModelUrl;

diff --git a/libraries/avatars/src/HeadData.h b/libraries/avatars/src/HeadData.h
@@ -128,7 +128,12 @@ class HeadData {
     AvatarData* _owningAvatar;
 
 private:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    HeadData(const HeadData&);
+    HeadData& operator= (const HeadData&);
+#else
     Q_DISABLE_COPY(HeadData)
+#endif
 
     void setHeadOrientation(const glm::quat& orientation);
 };

diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -738,7 +738,11 @@ Mapping::Pointer UserInputMapper::newMapping(const QString& mappingName) {
 //        if (request->getResult() == ResourceRequest::Success) {
 //            result = parseMapping(QString(request->getData()));
 //        } else {
+// #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+//            qCWarning(controllers) << "Failed to load mapping url <" << jsonUrl << ">" << endl;
+// #else
 //            qCWarning(controllers) << "Failed to load mapping url <" << jsonUrl << ">" << Qt::endl;
+// #endif
 //        }
 //        request->deleteLater();
 //    }
@@ -1177,13 +1181,22 @@ Mapping::Pointer UserInputMapper::parseMapping(const QString& json) {
     if (doc.isNull()) {
         qCDebug(controllers) << "Invalid JSON...\n";
         qCDebug(controllers) << error.errorString();
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        qCDebug(controllers) << "JSON was:\n" << json << endl;
+#else
         qCDebug(controllers) << "JSON was:\n" << json << Qt::endl;
+#endif
         return Mapping::Pointer();
     }
 
     if (!doc.isObject()) {
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+        qWarning() << "Mapping json Document is not an object" << endl;
+        qCDebug(controllers) << "JSON was:\n" << json << endl;
+#else
         qWarning() << "Mapping json Document is not an object" << Qt::endl;
         qCDebug(controllers) << "JSON was:\n" << json << Qt::endl;
+#endif
         return Mapping::Pointer();
     }
     return parseMapping(doc.object());

diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.h b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
@@ -161,7 +161,11 @@ protected slots:
     // application specific position, when it's in desktop mode, the reticle position will simply move
     // the system mouse.
     glm::vec2 _reticlePositionInHMD { 0.0f, 0.0f };
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    mutable QMutex _reticleLock { QMutex::Recursive };
+#else
     mutable QRecursiveMutex _reticleLock;
+#endif
 
     QPointF _lastKnownRealMouse;
     bool _ignoreMouseMove { false };

diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -124,9 +124,15 @@ HTTPConnection::HTTPConnection(QTcpSocket* socket, HTTPManager* parentManager) :
     _socket->setParent(this);
 
     // connect initial slots
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    connect(socket, SIGNAL(readyRead()), SLOT(readRequest()));
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(deleteLater()));
+    connect(socket, SIGNAL(disconnected()), SLOT(deleteLater()));
+#else
     connect(socket, &QAbstractSocket::readyRead, this, &HTTPConnection::readRequest);
     connect(socket, &QAbstractSocket::errorOccurred, this, &HTTPConnection::deleteLater);
     connect(socket, &QAbstractSocket::disconnected, this, &HTTPConnection::deleteLater);
+#endif
 }
 
 HTTPConnection::~HTTPConnection() {

diff --git a/libraries/entities/src/EntitySimulation.h b/libraries/entities/src/EntitySimulation.h
@@ -44,7 +44,11 @@ const int DIRTY_SIMULATION_FLAGS =
 
 class EntitySimulation : public QObject, public std::enable_shared_from_this<EntitySimulation> {
 public:
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    EntitySimulation() : _mutex(QMutex::Recursive), _nextExpiry(std::numeric_limits<uint64_t>::max()), _entityTree(nullptr) { }
+#else
     EntitySimulation() : _mutex(), _nextExpiry(std::numeric_limits<uint64_t>::max()), _entityTree(nullptr) { }
+#endif
     virtual ~EntitySimulation() { setEntityTree(nullptr); }
 
     inline EntitySimulationPointer getThisPointer() const {
@@ -90,7 +94,11 @@ class EntitySimulation : public QObject, public std::enable_shared_from_this<Ent
     void callUpdateOnEntitiesThatNeedIt(uint64_t now);
     virtual void sortEntitiesThatMoved();
 
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+    QMutex _mutex{ QMutex::Recursive };
+#else
     QRecursiveMutex _mutex;
+#endif
 
     SetOfEntities _entitiesToSort; // entities moved by simulation (and might need resort in EntityTree)
     SetOfEntities _simpleKinematicEntities; // entities undergoing non-colliding kinematic motion