overte-org · RTUnreal · Sep 6, 2025 · Sep 6, 2025 · Sep 7, 2025 · Sep 7, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -136,7 +136,7 @@ if (ANDROID)
     add_definitions(-DANDROID_APP_INTERFACE)
   endif()
 else ()
-  set(PLATFORM_QT_COMPONENTS WebEngine Xml)
+  set(PLATFORM_QT_COMPONENTS WebEngineCore Xml)
   add_definitions(-DHAVE_EXT_clip_cull_distance)
 endif()
 
@@ -160,7 +160,7 @@ else()
 endif()
 
 foreach(PLATFORM_QT_COMPONENT ${PLATFORM_QT_COMPONENTS})
-  list(APPEND PLATFORM_QT_LIBRARIES "Qt5::${PLATFORM_QT_COMPONENT}")
+  list(APPEND PLATFORM_QT_LIBRARIES "Qt6::${PLATFORM_QT_COMPONENT}")
 endforeach()
 
 message(STATUS "Use optimized IK:      " ${OVERTE_USE_OPTIMIZED_IK})

diff --git a/android/apps/framePlayer/src/main/cpp/qml/main.qml b/android/apps/framePlayer/src/main/cpp/qml/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.2
-import QtQuick.Dialogs 1.1
+import QtQuick.Dialogs
 import Qt.labs.folderlistmodel 2.11
 
 Item {

diff --git a/android/apps/interface/src/main/cpp/native.cpp b/android/apps/interface/src/main/cpp/native.cpp
@@ -407,7 +407,7 @@ Java_io_highfidelity_hifiinterface_fragment_LoginFragment_retrieveAccessToken(JN
 
     QMetaObject::invokeMethod(accountManager.data(), "requestAccessTokenWithAuthCode",
                               Q_ARG(const QString&, authCode), Q_ARG(const QString&, clientId),
-                              Q_ARG(const QString&, clientSecret), Q_ARG(const QString&, redirectUri));
+                              Q_GENERIC_ARG(const QString&, clientSecret), Q_GENERIC_ARG(const QString&, redirectUri));
 
 }
 

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
@@ -753,7 +753,7 @@ void Agent::processAgentAvatarAudio() {
             if (_numAvatarSoundSentBytes == (int)audioData->getNumBytes()) {
                 // we're done with this sound object - so set our pointer back to NULL
                 // and our sent bytes back to zero
-                _avatarSound.clear();
+                _avatarSound.reset();
                 _numAvatarSoundSentBytes = 0;
                 _flushEncoder = true;
 

diff --git a/assignment-client/src/AgentScriptingInterface.h b/assignment-client/src/AgentScriptingInterface.h
@@ -101,7 +101,7 @@ public slots:
      *     }, 1000);
      * }());
      */
-    void playAvatarSound(SharedSoundPointer avatarSound) const { _agent->playAvatarSound(avatarSound); }
+    void playAvatarSound(std::shared_ptr<Sound> avatarSound) const { _agent->playAvatarSound(avatarSound); }
 
 private:
     Agent* _agent;

diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -295,7 +295,7 @@ void AssignmentClientMonitor::spawnChildClient() {
 
 void AssignmentClientMonitor::checkSpares() {
     auto nodeList = DependencyManager::get<LimitedNodeList>();
-    QUuid aSpareId = "";
+    QUuid aSpareId {};
     unsigned int spareCount = 0;
     unsigned int totalCount = 0;
 

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
@@ -28,6 +28,7 @@
 #include <QtGui/QImageReader>
 #include <QtCore/QVector>
 #include <QtCore/QUrlQuery>
+#include <QtCore5Compat/QRegExp>
 
 #include <ClientServerUtils.h>
 #include <NodeType.h>
@@ -434,7 +435,7 @@ void AssetServer::completeSetup() {
         // Check the asset directory to output some information about what we have
         auto files = _filesDirectory.entryList(QDir::Files);
 
-        QRegExp hashFileRegex { AssetUtils::ASSET_HASH_REGEX_STRING };
+        QRegularExpression hashFileRegex { AssetUtils::ASSET_HASH_REGEX_STRING };
         auto hashedFiles = files.filter(hashFileRegex);
 
         qCInfo(asset_server) << "There are" << hashedFiles.size() << "asset files in the asset directory.";

diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -64,14 +64,14 @@ void ScriptableAvatar::stopAnimation() {
         QMetaObject::invokeMethod(this, "stopAnimation");
         return;
     }
-    _animation.clear();
+    _animation.reset();
 }
 
 AnimationDetails ScriptableAvatar::getAnimationDetails() {
     if (QThread::currentThread() != thread()) {
         AnimationDetails result;
         BLOCKING_INVOKE_METHOD(this, "getAnimationDetails", 
-                                  Q_RETURN_ARG(AnimationDetails, result));
+                                  Q_GENERIC_RETURN_ARG(AnimationDetails, result));
         return result;
     }
     return _animationDetails;
@@ -222,7 +222,7 @@ void ScriptableAvatar::update(float deltatime) {
                 }
 
             } else {
-                _animation.clear();
+                _animation.reset();
             }
         }
     }

diff --git a/assignment-client/src/octree/OctreeHeadlessViewer.h b/assignment-client/src/octree/OctreeHeadlessViewer.h
@@ -43,14 +43,14 @@ public slots:
      * @function EntityViewer.setPosition
      * @param {Vec3} position - The position of the view frustum.
      */
-    void setPosition(const glm::vec3& position) { _hasViewFrustum = true; _viewFrustum.setPosition(position); }
+    void setPosition(const glm::vec<3,float,glm::packed_highp>& position) { _hasViewFrustum = true; _viewFrustum.setPosition(position); }
 
     /*@jsdoc
      * Sets the orientation of the view frustum.
      * @function EntityViewer.setOrientation
      * @param {Quat} orientation - The orientation of the view frustum.
      */
-    void setOrientation(const glm::quat& orientation) { _hasViewFrustum = true; _viewFrustum.setOrientation(orientation); }
+    void setOrientation(const glm::qua<float,glm::packed_highp>& orientation) { _hasViewFrustum = true; _viewFrustum.setOrientation(orientation); }
 
     /*@jsdoc
      * Sets the radius of the center "keyhole" in the view frustum.
@@ -99,14 +99,14 @@ public slots:
      * @function EntityViewer.getPosition
      * @returns {Vec3} The position of the view frustum.
      */
-    const glm::vec3& getPosition() const { return _viewFrustum.getPosition(); }
+    const glm::vec<3,float,glm::packed_highp>& getPosition() const { return _viewFrustum.getPosition(); }
 
     /*@jsdoc
      * Gets the orientation of the view frustum.
      * @function EntityViewer.getOrientation
      * @returns {Quat} The orientation of the view frustum.
      */
-    const glm::quat& getOrientation() const { return _viewFrustum.getOrientation(); }
+    const glm::qua<float,glm::packed_highp>& getOrientation() const { return _viewFrustum.getOrientation(); }
 
 
     // getters for LOD and PPS

diff --git a/cmake/macros/MemoryDebugger.cmake b/cmake/macros/MemoryDebugger.cmake
@@ -41,9 +41,9 @@ if (OVERTE_MEMORY_DEBUGGING)
     # usr/bin/ld: ../../libraries/audio/libaudio.so: undefined reference to `FIR_1x4_AVX512(float*, float*, float*, float*, float*, float (*) [64], int)'
     # The '-DSTACK_PROTECTOR' argument below disables the usage of this function in the code. This should be fine as it only works on the latest Intel hardware,
     # and is an optimization that should make no functional difference.
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak -U_FORTIFY_SOURCE -DSTACK_PROTECTOR -fstack-protector-strong -fno-omit-frame-pointer")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak")
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak -U_FORTIFY_SOURCE -DSTACK_PROTECTOR -fstack-protector-strong -fno-omit-frame-pointer -fsanitize-recover=address")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak -fsanitize-recover=address")
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize=leak -fsanitize-recover=address")
   elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     # https://docs.microsoft.com/en-us/cpp/sanitizers/asan?view=msvc-160
     # Supported experimentally starting from VS2019 v16.4, and officially from v16.9.

diff --git a/cmake/macros/PackageLibrariesForDeployment.cmake b/cmake/macros/PackageLibrariesForDeployment.cmake
@@ -14,7 +14,7 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
     if (WIN32)
         set(PLUGIN_PATH "plugins")
 
-        get_target_property(Qt_Core_Location Qt5::Core LOCATION)
+        get_target_property(Qt_Core_Location Qt6::Core LOCATION)
         get_filename_component(QT_BIN_DIR ${Qt_Core_Location} DIRECTORY)
         find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_BIN_DIR})
 
@@ -23,7 +23,7 @@ macro(PACKAGE_LIBRARIES_FOR_DEPLOYMENT)
         endif ()
 
         # add a post-build command to call windeployqt to copy Qt plugins
-        set(CMD "${WINDEPLOYQT_COMMAND} ${EXTRA_DEPLOY_OPTIONS} --no-compiler-runtime --no-opengl-sw --no-angle -no-system-d3d-compiler")
+        set(CMD "${WINDEPLOYQT_COMMAND} ${EXTRA_DEPLOY_OPTIONS} --no-compiler-runtime --no-opengl-sw -no-system-d3d-compiler")
 
         file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/windeploy-${TARGET_NAME}.bat" "${CMD} %*")
         add_custom_command(

diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
@@ -64,13 +64,13 @@ macro(SETUP_HIFI_LIBRARY)
   endif ()
 
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
-  list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
+  list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core Core5Compat)
 
   # find these Qt modules and link them to our own target
-  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED CMAKE_FIND_ROOT_PATH_BOTH)
+  find_package(Qt6 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED CMAKE_FIND_ROOT_PATH_BOTH)
 
   foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
-    target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
+    target_link_libraries(${TARGET_NAME} Qt6::${QT_MODULE})
   endforeach()
 
   # Don't make scribed shaders, generated entity files, generated pipelines, or QT resource files cumulative

diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
@@ -29,10 +29,10 @@ macro(SETUP_HIFI_PROJECT)
   target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
 
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
-  list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
+  list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core Core5Compat)
 
   # find these Qt modules and link them to our own target
-  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED)
+  find_package(Qt6 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED)
 
   # disable /OPT:REF and /OPT:ICF for the Debug builds
   # This will prevent the following linker warnings
@@ -42,7 +42,7 @@ macro(SETUP_HIFI_PROJECT)
   endif()
 
   foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
-    target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
+    target_link_libraries(${TARGET_NAME} Qt6::${QT_MODULE})
   endforeach()
   target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
 

diff --git a/cmake/macros/SetupHifiTestCase.cmake b/cmake/macros/SetupHifiTestCase.cmake
@@ -109,10 +109,10 @@ macro(SETUP_HIFI_TESTCASE)
         list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core Test)
 
         # find these Qt modules and link them to our own target
-        find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED)
+        find_package(Qt6 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} QUIET REQUIRED)
 
         foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
-          target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
+          target_link_libraries(${TARGET_NAME} Qt6::${QT_MODULE})
         endforeach()
         target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
 

diff --git a/cmake/macros/TargetQuazip.cmake b/cmake/macros/TargetQuazip.cmake
@@ -1,19 +1,26 @@
-# 
+#
 #  Copyright 2015 High Fidelity, Inc.
 #  Copyright 2026 Overte e.V.
 #  Created by Leonardo Murillo on 2015/11/20
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
+#
 macro(TARGET_QUAZIP)
+    # System QuaZip sets `IMPORTED_GLOBAL` for itself when finding it using find_package().
+    # Running find_package() a second time shouldn't do anything, since the package was already found,
+    # yet it fails with:
+    # `Attempt to promote imported target "QuaZip::QuaZip" to global scope (by setting IMPORTED_GLOBAL) which is not built in this directory.`
+    # We avoid this error by guarding against running find_package() multiple times.
     if(OVERTE_USE_SYSTEM_LIBS)
         find_package(PkgConfig REQUIRED)
-        pkg_check_modules(QuaZip REQUIRED quazip1-qt5)
+        pkg_check_modules(QuaZip REQUIRED quazip1-qt6)
         target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${QuaZip_INCLUDE_DIRS})
         target_link_libraries(${TARGET_NAME} ${QuaZip_LINK_LIBRARIES})
     else()
-        find_package(QuaZip-Qt5 QUIET REQUIRED)
+        if(NOT TARGET QuaZip::QuaZip)  # if target doesn't exist.
+            find_package(QuaZip-Qt6 QUIET REQUIRED)
+        endif()
         target_link_libraries(${TARGET_NAME} QuaZip::QuaZip)
     endif()
 endmacro()
diff --git a/cmake/macros/TargetVulkan.cmake b/cmake/macros/TargetVulkan.cmake
@@ -7,7 +7,7 @@
 macro(TARGET_VULKAN)
     find_package(Vulkan QUIET REQUIRED)
     find_package(VulkanMemoryAllocator QUIET REQUIRED)
-    find_package(Qt5 COMPONENTS X11Extras QUIET REQUIRED)
+    find_package(Qt6 COMPONENTS X11Extras QUIET REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${VULKAN_INCLUDE_DIR})
     target_link_libraries(${TARGET_NAME} GPUOpen::VulkanMemoryAllocator)
     target_link_libraries(${TARGET_NAME} ${VULKAN_LIBRARY})

diff --git a/cmake/modules/FindQt5LinguistToolsMacros.cmake b/cmake/modules/FindQt5LinguistToolsMacros.cmake
@@ -30,7 +30,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #=============================================================================
 
-function(QT5_CREATE_TRANSLATION_CUSTOM _qm_files)
+function(QT6_CREATE_TRANSLATION_CUSTOM _qm_files)
     set(options)
     set(oneValueArgs)
     set(multiValueArgs OPTIONS)
@@ -76,20 +76,20 @@ function(QT5_CREATE_TRANSLATION_CUSTOM _qm_files)
         get_source_file_property(_qm_output_location ${_ts_file} OUTPUT_LOCATION)
         add_custom_command(
             OUTPUT ${_tmpts_file}
-            COMMAND ${Qt5_LUPDATE_EXECUTABLE}
+            COMMAND ${Qt6_LUPDATE_EXECUTABLE}
             ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
             COMMAND ${CMAKE_COMMAND} -E copy ${_ts_file} ${_tmpts_file}
             DEPENDS ${_my_sources} ${_ts_lst_file} VERBATIM)
         if( _qm_output_location )
  	    set_property(SOURCE ${_tmpts_file} PROPERTY OUTPUT_LOCATION ${_qm_output_location})
  	endif()
     endforeach()
-    qt5_add_translation(${_qm_files} ${_my_temptsfiles})
+    qt6_add_translation(${_qm_files} ${_my_temptsfiles})
     set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)
 endfunction()
 
 
-function(QT5_ADD_TRANSLATION _qm_files)
+function(QT6_ADD_TRANSLATION _qm_files)
     foreach(_current_FILE ${ARGN})
         get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
         get_filename_component(qm ${_abs_FILE} NAME_WE)
@@ -102,7 +102,7 @@ function(QT5_ADD_TRANSLATION _qm_files)
         endif()
 
         add_custom_command(OUTPUT ${qm}
-            COMMAND ${Qt5_LRELEASE_EXECUTABLE}
+            COMMAND ${Qt6_LRELEASE_EXECUTABLE}
             ARGS ${_abs_FILE} -qm ${qm}
             DEPENDS ${_abs_FILE} VERBATIM
         )

diff --git a/conanfile.py b/conanfile.py
@@ -24,6 +24,7 @@ class Overte(ConanFile):
         "openssl*:shared": "True",
         "qt*:shared": "True",
         "qt*:gui": "True",
+        "qt*:qt5compat": "True",  # Required by Quazip 1.4 and probably us
         "qt*:qtdeclarative": "True",
         "qt*:qtimageformats": "True",  # WebP texture support
         "qt*:qtlocation": "True",
@@ -39,6 +40,12 @@ class Overte(ConanFile):
         "qt*:qtx11extras": "True",  # Required by gpu-frame-player on Linux
         "qt*:qtxmlpatterns": "True",
         "qt*:qttools": "True",  # windeployqt for Windows
+        "qt*:with_dbus": "True",  # Required for Qt on Linux. Can be disabled for Windows.
+        "fontconfig*:shared": "True",  # For Qt on Linux. Building with static fontconfig and freetype fails: https://github.com/conan-io/conan-center-index/issues/17142
+        "freetype*:shared": "True",  # For Qt on Linux.
+        "nss*:shared": "True",  # Dependency of Qt. "NSS recipe cannot yet build static library."
+        "nspr*:shared": "True",  # NSS, which is a dependency of Qt, cannot link to statis NSPR.
+        "sqlite*:shared": "True",  # Avoid `undefined symbol` errors when building NSS.
         "glad*:spec": "gl",
         "glad*:gl_profile": "core",
         "glad*:gl_version": "4.5",
@@ -98,7 +105,7 @@ def requirements(self):
                 # Use system OpenSSL to work around OpenSSL being missing from libnode's rpath and this cascading down to Interface.
                 openssl = "openssl/system@overte/stable#24c4df65c52791c4955f7d47d9faef0d"
                 self.requires("fcitx5-qt/5.1.13@overte/stable#41b7ae9082f32e1ad83fd8a43a2c8460")
-            self.requires("qt/5.15.18@overte/experimental#3a9079f3023351a7319be352cc6f4665", force=True)
+            self.requires("qt/6.8.3", force=True)
             # Replace Conan Center's glib package with our own duplicate to avoid their outdated binary cache. https://github.com/conan-io/conan-center-index/issues/17876
             self.requires("glib/2.78.3@overte/conancenter", override=True)
 
@@ -140,8 +147,8 @@ def generate(self):
             if self.settings.compiler == "gcc":
                 self.output.status("GCC compiler detected, setting default flags.")
                 tc.cache_variables.update({
-                    "CMAKE_CXX_FLAGS_DEBUG_INIT": "-Og -ggdb3",
-                    "CMAKE_C_FLAGS_DEBUG_INIT": "-Og -ggdb3",
+                    "CMAKE_CXX_FLAGS_DEBUG_INIT": "-O0 -ggdb3",
+                    "CMAKE_C_FLAGS_DEBUG_INIT": "-O0 -ggdb3",
                     "CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT": "-O2 -DNDEBUG -ggdb2",
                     "CMAKE_C_FLAGS_RELWITHDEBINFO_INIT": "-O2 -DNDEBUG -ggdb2",
                     "CMAKE_CXX_FLAGS_RELEASE_INIT": "-O3 -DNDEBUG",
@@ -150,8 +157,8 @@ def generate(self):
             elif self.settings.compiler == "clang":
                 self.output.status("Clang compiler detected, setting default flags.")
                 tc.cache_variables.update({
-                    "CMAKE_CXX_FLAGS_DEBUG_INIT": "-Og -g",
-                    "CMAKE_C_FLAGS_DEBUG_INIT": "-Og -g",
+                    "CMAKE_CXX_FLAGS_DEBUG_INIT": "-O0 -g",
+                    "CMAKE_C_FLAGS_DEBUG_INIT": "-O0 -g",
                     "CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT": "-O2 -DNDEBUG -g",
                     "CMAKE_C_FLAGS_RELWITHDEBINFO_INIT": "-O2 -DNDEBUG -g",
                     "CMAKE_CXX_FLAGS_RELEASE_INIT": "-O3 -DNDEBUG",

diff --git a/domain-server/src/ContentSettingsBackupHandler.cpp b/domain-server/src/ContentSettingsBackupHandler.cpp
@@ -20,6 +20,7 @@
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 #include <quazip/quazipdir.h>
+#include <QtCore5Compat/QRegExp>
 
 #if !defined(__clang__) && defined(__GNUC__)
 #pragma GCC diagnostic pop
@@ -102,7 +103,7 @@ std::pair<bool, QString> ContentSettingsBackupHandler::recoverBackup(const QStri
     zipFile.close();
 
     if (zipFile.getZipError() != UNZ_OK) {
-        QString errorStr("Failed to unzip " + CONTENT_SETTINGS_BACKUP_FILENAME + ": " + zipFile.getZipError());
+        QString errorStr("Failed to unzip " + CONTENT_SETTINGS_BACKUP_FILENAME + ": " + QString::number(zipFile.getZipError()));
         qCritical() << errorStr;
         return { false, errorStr };
     }

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
@@ -28,6 +28,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QtCore5Compat/QRegExp>
 
 #include <quazip/quazip.h>
 
@@ -81,7 +82,7 @@ void DomainContentBackupManager::parseBackupRules(const QVariantList& backupRule
         int count = map["maxBackupVersions"].toInt();
         auto name = map["Name"].toString();
         auto format = name.toLower();
-        QRegExp matchDisallowedCharacters { "[^a-zA-Z0-9\\-_]+" };
+        QRegularExpression matchDisallowedCharacters { "[^a-zA-Z0-9\\-_]+" };
         format.replace(matchDisallowedCharacters, "_");
 
         qCDebug(domain_server) << "    Name:" << name;
@@ -313,8 +314,8 @@ void DomainContentBackupManager::recoverFromBackup(MiniPromise::Promise promise,
     };
 
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "recoverFromBackup", Q_ARG(MiniPromise::Promise, promise),
-                                  Q_ARG(const QString&, backupName), Q_ARG(const QString&, username));
+        QMetaObject::invokeMethod(this, "recoverFromBackup", Q_GENERIC_ARG(MiniPromise::Promise, promise),
+                                  Q_GENERIC_ARG(const QString&, backupName), Q_GENERIC_ARG(const QString&, username));
         return;
     }