misc: bump daemon

Change-Id: If3f8d438b2a3ef82b6ad9bf63cbd44d84be84498

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+custom: ['https://jami.net/whydonate/']
+lfx_crowdfunding: jami-a-gnu-package

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "3rdparty/qrencode-win32"]
 	path = 3rdparty/qrencode-win32
-	url = https://github.com/BlueDragon747/qrencode-win32.git
+	url = https://github.com/blizzard4591/qrencode-win32.git
 	ignore = dirty
 [submodule "3rdparty/libqrencode"]
 	url = https://github.com/fukuchi/libqrencode.git

CMakeLists.txt

@@ -29,12 +29,40 @@ else()
   project(jami)
 endif()
 
-option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" OFF)
+option(WITH_DAEMON_SUBMODULE "Build with daemon submodule" ON)
+option(JAMICORE_AS_SUBDIR "Build Jami-core as a subdir dependency" OFF)
 option(ENABLE_TESTS "Build with tests" OFF)
 option(WITH_WEBENGINE "Build with WebEngine" ON)
 if(WITH_WEBENGINE)
   add_definitions(-DWITH_WEBENGINE)
 endif()
+option(ENABLE_LIBWRAP "Enable libwrap (single process mode)" ON)
+if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    OR ENABLE_LIBWRAP
+    # because mocks use the same interface present in qtwrapper/
+    OR ENABLE_TEST)
+  set(ENABLE_LIBWRAP true)
+endif()
+option(ENABLE_ASAN "Enable address sanitization" OFF)
+if(ENABLE_ASAN AND NOT MSVC)
+  message(STATUS "Address sanitization enabled for client")
+  # Add AddressSanitizer flags for both compiler and linker
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+endif()
+
+# jami-core
+if(NOT WITH_DAEMON_SUBMODULE)
+  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
+else()
+  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
+endif()
+
+# For now only MSVC is supported for building Jami-core within the
+# client cmake.
+if(JAMICORE_AS_SUBDIR)
+  add_subdirectory(${DAEMON_DIR})
+endif()
 
 # init some variables for includes, libs, etc.
 set(CLIENT_INCLUDE_DIRS, "")
@@ -43,21 +71,16 @@ set(CLIENT_LIBS, "")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+if(NOT MSVC)
+  set(CMAKE_CXX_FLAGS_DEBUG "-Og -ggdb")
+endif()
+
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-# Main project directories:
-
-# jami-daemon
-if(NOT WITH_DAEMON_SUBMODULE)
-  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
-else()
-  set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
-endif()
 # src
 set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient)
 set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app)
@@ -74,7 +97,7 @@ set(TESTS_DIR ${PROJECT_SOURCE_DIR}/tests)
 # Here we let find_package(<PackageName>...) try to find Qt 6,
 # If it is found, find_package will succeed, and the CMake variable
 # QT_VERSION_MAJOR will be defined 6.
-set(QT6_MINVER_MINOR 4)
+set(QT6_MINVER_MINOR 5)
 if(QT6_VER AND QT6_PATH)
   find_package(QT NAMES Qt6 REQUIRED
     PATHS ${QT6_PATH} NO_DEFAULT_PATH)
@@ -83,20 +106,10 @@ else()
   find_package(QT NAMES Qt6 REQUIRED)
 endif()
 if (${QT_VERSION_MINOR} GREATER_EQUAL ${QT6_MINVER_MINOR})
-  # Qt version is 6.4 or higher
+  # Qt version is 6.5 or higher
   message(STATUS "Found a suitable Qt version ${QT_VERSION}")
 else()
-  message(FATAL_ERROR "Qt 6.4 or higher is required. Found ${QT_VERSION}")
-endif()
-
-if(MSVC)
-  set(DEFAULT_BUILD_TYPE "Debug")
-  if(NOT CMAKE_BUILD_TYPE)
-    message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
-    set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE
-        STRING "Choose the type of build." FORCE)
-  endif()
-  set(OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/x64/${CMAKE_BUILD_TYPE}")
+  message(FATAL_ERROR "Qt 6.5 or higher is required. Found ${QT_VERSION}")
 endif()
 
 # libjamiclient
@@ -244,6 +257,8 @@ set(COMMON_SOURCES
   ${APP_SRC_DIR}/messageparser.cpp
   ${APP_SRC_DIR}/previewengine.cpp
   ${APP_SRC_DIR}/imagedownloader.cpp
+  ${APP_SRC_DIR}/pluginversionmanager.cpp
+  ${APP_SRC_DIR}/connectioninfolistmodel.cpp
   ${APP_SRC_DIR}/pluginversionmanager.cpp)
 
 set(COMMON_HEADERS
@@ -310,8 +325,9 @@ set(COMMON_HEADERS
   ${APP_SRC_DIR}/messageparser.h
   ${APP_SRC_DIR}/htmlparser.h
   ${APP_SRC_DIR}/imagedownloader.h
-  ${APP_SRC_DIR}/pluginversionmanager.h)
-
+  ${APP_SRC_DIR}/pluginversionmanager.h
+  ${APP_SRC_DIR}/connectioninfolistmodel.h
+  ${APP_SRC_DIR}/pttlistener.h)
 
 # For libavutil/avframe.
 set(LIBJAMI_CONTRIB_DIR "${DAEMON_DIR}/contrib")
@@ -347,10 +363,6 @@ if(MSVC)
   # preprocessor defines
   add_definitions(-DUNICODE -DQT_NO_DEBUG -DNDEBUG)
 
-  # dependencies
-  set(QRENCODE_DIR
-    ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
-
   # compiler options
   add_compile_options(
     /wd4068 /wd4099 /wd4189 /wd4267 /wd4577 /wd4467 /wd4715 /wd4828)
@@ -368,12 +380,13 @@ if(MSVC)
     "/NODEFAULTLIB:LIBCMT")
 
   # client deps
-  set(QRENCODE_LIB
-    ${QRENCODE_DIR}/vc8/qrcodelib/x64/Release-Lib/qrcodelib.lib)
+  set(QRENCODE_DIR ${PROJECT_SOURCE_DIR}/3rdparty/qrencode-win32/qrencode-win32)
+  file(GLOB_RECURSE QRENCODE_LIB ${QRENCODE_DIR}/qrcodelib.lib)
+  file(GLOB_RECURSE QRENCODE_INCLUDE ${QRENCODE_DIR}/qrencode.h)
+  get_filename_component(QRENCODE_INCLUDE_DIR ${QRENCODE_INCLUDE} DIRECTORY)
 
   # daemon
   set(JAMID_SRC_PATH ${DAEMON_DIR}/contrib/msvc/include)
-  set(JAMID_LIB ${DAEMON_DIR}/build/x64/ReleaseLib_win32/bin/libjami.lib)
   set(GNUTLS_LIB ${DAEMON_DIR}/contrib/msvc/lib/x64/libgnutls.lib)
 
   # Beta config
@@ -389,7 +402,7 @@ if(MSVC)
   include_directories(
     ${JAMID_SRC_PATH}
     ${LIBCLIENT_SRC_DIR}
-    ${QRENCODE_DIR})
+    ${QRENCODE_INCLUDE_DIR})
 elseif (NOT APPLE)
   list(APPEND COMMON_SOURCES
     ${APP_SRC_DIR}/xrectsel.c
@@ -493,6 +506,29 @@ else()
     OPTIONAL_COMPONENTS LinguistTools)
 endif()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if (DEFINED ENV{XDG_SESSION_TYPE})
+        if ($ENV{XDG_SESSION_TYPE} STREQUAL "x11")
+            set(PTT_PLATFORM "x11")
+            list(APPEND COMMON_HEADER ${APP_SRC_DIR}/platform/X11/xcbkeyboard.H)
+        # TODO: add Wayland support
+        endif ()
+    endif ()
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(PTT_PLATFORM "windows")
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(PTT_PLATFORM "macos")
+endif ()
+
+if (NOT ${PTT_PLATFORM} STREQUAL "")
+    message(STATUS "Platform: ${PTT_PLATFORM}")
+    add_definitions(-DHAVE_GLOBAL_PTT)
+    list(APPEND COMMON_SOURCES ${APP_SRC_DIR}/platform/${PTT_PLATFORM}/pttlistener.cpp)
+else ()
+    message(WARNING "Global push-to-talk not supported.")
+    list(APPEND COMMON_SOURCES ${APP_SRC_DIR}/platform/local/pttlistener.cpp)
+endif ()
+
 # common includes
 include_directories(
   ${PROJECT_SOURCE_DIR}
@@ -546,7 +582,7 @@ if(MSVC)
     WIN32_EXECUTABLE TRUE)
 
   list(APPEND CLIENT_LIBS
-    ${JAMID_LIB}
+    ${LIBJAMI_LIB}
     ${GNUTLS_LIB}
     ${LIBCLIENT_NAME}
     ${QT_LIBS}
@@ -593,7 +629,6 @@ elseif (NOT APPLE)
     ${GLIB_LIBRARIES}
     ${GIO_LIBRARIES})
 
-  # Installation rules
   install(
     TARGETS ${PROJECT_NAME}
     RUNTIME DESTINATION bin)
@@ -724,7 +759,7 @@ else()
   list(APPEND CLIENT_LIBS
     "-framework AVFoundation"
     "-framework CoreAudio -framework CoreMedia -framework CoreVideo"
-    "-framework VideoToolbox -framework AudioUnit"
+    "-framework VideoToolbox -framework AudioUnit -framework Carbon"
     "-framework Security"
       compression
       resolv
@@ -763,6 +798,7 @@ else()
           MACOSX_BUNDLE_COPYRIGHT "${PROJ_COPYRIGHT}")
       if(APPSTORE)
           message(STATUS "app store version")
+          add_definitions(-DAPPSTORE)
           set_target_properties(${PROJECT_NAME} PROPERTIES
                XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
       else()

INSTALL.md

@@ -7,9 +7,9 @@ There are essentially two ways to build `client-qt`:
 
 ## Disclaimer
 
-Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.4 is necessary.
+Because the client-qt is multi-platforms and supporting macOS, we need a recent version of Qt to do rendering with Metal. So, Qt 6.5 is necessary.
 This version is generally not packaged on a lot of platforms, and to control available plugins and such, we have our own Qt packaged (available on https://jami.net on the distributions we support).
-So, you will need to get Qt 6.4 first. For this, there is 3 methods:
+So, you will need to get Qt 6.5 first. For this, there is 3 methods:
 
 ### Qt from our repo (recommended)
 
@@ -49,7 +49,7 @@ sudo dnf update && sudo dnf install jami-libqt
 
 ### Qt from your distribution
 
-If Qt 6.4 is available, you can use the packages from your distribution:
+If Qt 6.5 is available, you can use the packages from your distribution:
 
 It should be (For now qt5 only is packaged by distributions, so names can change).
 
@@ -118,7 +118,7 @@ Then, you can build daemon and the client using:
 
 If you use a Qt version that is not system-wide installed, you need to
 specify its path using the `--qt` flag, e.g.
-`./build.py --install --qt=/home/<username>/Qt/6.4.1/gcc_64`.
+`./build.py --install --qt=/home/<username>/Qt/6.5.1/gcc_64`.
 
 Now you will have the daemon in `daemon/bin/dbus/jamid` and the client in
 `build/jami`. You can now run Jami using:
@@ -134,7 +134,7 @@ Notes:
 
 ## Build only the client
 
-In order to use the Qt Client it is necessary to have the Qt version 6.4 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
+In order to use the Qt Client it is necessary to have the Qt version 6.5 or higher. If your system does not have it you can install it [from sources or download the binary installer](https://www.qt.io/download).
 
 ## Build only this repository
 
@@ -184,7 +184,7 @@ Only 64-bit MSVC build can be compiled.
 
 - Download [Qt (Open Source)](https://www.qt.io/download-open-source?hsCtaTracking=9f6a2170-a938-42df-a8e2-a9f0b1d6cdce%7C6cb0de4f-9bb5-4778-ab02-bfb62735f3e5)
 
-- Using the online installer, install the following Qt 6.4.3 components:
+- Using the online installer, install the following Qt 6.5.3 components:
 
   - Git 2.10.2
   - MSVC 2019 64-bit
@@ -207,7 +207,7 @@ Only 64-bit MSVC build can be compiled.
 
   |                      | Qt Version |
   | -------------------- | ---------- |
-  | Minimum requirement: | 6.4.3      |
+  | Minimum requirement: | 6.5.3      |
 
 - Install [Python3](https://www.python.org/downloads/) for Windows
 
@@ -233,7 +233,7 @@ Only 64-bit MSVC build can be compiled.
 - Using a new **Non-Elevated Command Prompt**
 
 ```bash
-    python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64)
+    python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
 ```
 
 > **SDK** Note:
@@ -276,7 +276,7 @@ Once the build has finished, you should then be able to use the Visual Studio So
 
 ```
     python extras\scripts\build-windows.py --init
-    python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64)
+    python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.5.3/msvc2019_64)
 ```
 
 ## Building On MacOS
@@ -286,9 +286,9 @@ Once the build has finished, you should then be able to use the Visual Studio So
 - macOS minimum version 10.15
 - install python3
 - download xcode
-- install Qt 6.4
+- install Qt 6.5
 
-Qt 6.4 can be installed via brew
+Qt 6.5 can be installed via brew
 
 ```bash
 brew install qt

build.py

@@ -28,6 +28,7 @@ import shutil
 import subprocess
 import sys
 import time
+import re
 
 OSX_DISTRIBUTION_NAME = "osx"
 WIN32_DISTRIBUTION_NAME = "win32"
@@ -44,7 +45,7 @@ APT_BASED_DISTROS = [
 ]
 
 DNF_BASED_DISTROS = [
-    'fedora', 'rhel',
+    'fedora', 'rhel', 'almalinux',
 ]
 
 PACMAN_BASED_DISTROS = [
@@ -363,10 +364,10 @@ def cwd(path):
 def run_install(args):
     # Platforms with special compilation scripts
     if args.distribution == WIN32_DISTRIBUTION_NAME:
-        with cwd('daemon/compat/msvc'):
-            execute_script(
-                ['python winmake.py -iv '
-                 f'-s {args.sdk} -b daemon'])
+        if not args.pywinmake:
+            with cwd('daemon/compat/msvc'):
+                execute_script([f'python winmake.py -iv -s {args.sdk} -b daemon'])
+
         build_windows = 'extras/scripts/build-windows.py'
         execute_script([f'python {build_windows} --init'])
         execute_script([f'python {build_windows} --qt={args.qt}'])
@@ -386,6 +387,8 @@ def run_install(args):
         install_args.append('-u')
     if args.debug:
         install_args.append('-d')
+    if args.asan:
+        install_args.append('-A')
     if args.no_libwrap:
         install_args.append('-W')
     if args.no_webengine:
@@ -458,6 +461,93 @@ def run_clean():
                     'git submodule foreach git clean -xfd'])
 
 
+def clean_contribs(contribs):
+    """
+    Helper to clean one or more of the libjami contribs.
+
+    Takes a list of contrib names(space separated) to clean, or 'all' to clean all contribs.
+
+    Contribs are assumed to be in the contrib_dir: daemon/contrib
+    Artifacts to remove include:
+    - build directory: <contrib_dir>/<native_dir>/<contrib_name>
+    - build stamp: <contrib_dir>/<native_dir>/.<contrib_name>
+    - tarball: <contrib_dir>/tarballs/<contrib_name>*.tar.*
+    - build artifacts (we don't care about the contents of share):
+        - <contrib_dir>/<abi_triplet>/bin/<contrib_name>
+        - <contrib_dir>/<abi_triplet>/lib/<contrib_name>*
+        - <contrib_dir>/<abi_triplet>/include/<contrib_name>*
+    """
+
+    # Not supported on Windows
+    if platform.system() == 'Windows':
+        print('Cleaning contribs is not supported on Windows. Exiting.')
+        sys.exit(1)
+
+    # Assume we are using the submodule here.
+    contrib_dir = 'daemon/contrib'
+    sub_dirs = os.listdir(contrib_dir)
+
+    # Let's find the abi triplet:
+    # The abi_triplet is 3 parts: <arch>-<vendor>-<sys> and should be the only directory
+    # named like that in the contrib directory. We can use a regex to find it.
+    triplet_pattern = re.compile(r'^[a-zA-Z0-9_]+-[a-zA-Z0-9_]+-[a-zA-Z0-9_]+$')
+    def is_triplet(s):
+        return bool(triplet_pattern.match(s))
+    abi_triplet = ''
+    for sub_dir in sub_dirs:
+        if is_triplet(sub_dir):
+            abi_triplet = sub_dir
+            break
+
+    # If we didn't find the abi triplet, we need to stop.
+    if abi_triplet == '':
+        print('Could not find the abi triplet for the contribs. Exiting.')
+        sys.exit(1)
+
+    # Let's find the native build source directory (native-*)
+    native_dir = ''
+    for sub_dir in sub_dirs:
+        if sub_dir.startswith('native'):
+            native_dir = os.path.join(contrib_dir, sub_dir)
+            break
+
+    # If we didn't find the native build source directory, we need to stop.
+    if native_dir == '':
+        print('Could not find the native build source directory. Exiting.')
+        sys.exit(1)
+
+    # If contribs is 'all', construct the list of all contribs from the contrib native directory
+    # list of directories only
+    if contribs == ['all']:
+        contribs = [d for d in os.listdir(native_dir) if os.path.isdir(os.path.join(native_dir, d))]
+
+    # Clean each contrib
+    for contrib in contribs:
+        print(f'Cleaning contrib: {contrib} for {abi_triplet} in {native_dir}')
+        build_dir = os.path.join(native_dir, contrib, '*')
+        build_stamp = os.path.join(native_dir, f'.{contrib}*')
+        tarball = os.path.join(contrib_dir, 'tarballs', f'{contrib}*.tar.*')
+        bins = os.path.join(contrib_dir, abi_triplet, 'bin', contrib)
+        libs = os.path.join(contrib_dir, abi_triplet, 'lib', f'lib{contrib}*')
+        includes = os.path.join(contrib_dir, abi_triplet, 'include', f'{contrib}*')
+
+        # EXCEPTIONS: pjproject and ffmpeg
+        if contrib == 'pjproject':
+            libs =  f' {os.path.join(contrib_dir, abi_triplet, "lib", "libpj*")}' \
+                    f' {os.path.join(contrib_dir, abi_triplet, "lib", "libsrtp*")}'
+            includes = os.path.join(contrib_dir, abi_triplet, 'include', 'pj*')
+        elif contrib == 'ffmpeg':
+            libs = f' {os.path.join(contrib_dir, abi_triplet, "lib", "libav*")}' \
+                   f' {os.path.join(contrib_dir, abi_triplet, "lib", "libsw*")}'
+            includes = f' {os.path.join(contrib_dir, abi_triplet, "include", "libav*")}' \
+                       f' {os.path.join(contrib_dir, abi_triplet, "include", "libsw*")}'
+
+        # For a dry run:
+        #  execute_script([f'find {build_dir} {build_stamp} {tarball} {bins} {libs} {includes}'], fail=False)
+
+        execute_script([f'rm -rf {build_dir} {build_stamp} {tarball} {bins} {libs} {includes}'], fail=False)
+
+
 def run_run(args):
     run_env = os.environ
 
@@ -626,6 +716,8 @@ def parse_args():
     ap.add_argument('--global-install', default=False, action='store_true')
     ap.add_argument('--debug', default=False, action='store_true',
                     help='Build with debug support; run in GDB')
+    ap.add_argument('--asan', default=False, action='store_true',
+                    help='Build both daemon and client with ASAN')
     ap.add_argument('--background', default=False, action='store_true')
     ap.add_argument('--no-priv-install', dest='priv_install',
                     default=True, action='store_false')
@@ -640,6 +732,12 @@ def parse_args():
                     default=False, action='store_true',
                     help='Do not use Qt WebEngine.')
     ap.add_argument('--arch')
+    ap.add_argument('--clean-contribs', nargs='+',
+                    help='Clean the specified contribs (space separated) or \
+                          "all" to clean all contribs before building.')
+    ap.add_argument('--pywinmake', dest='pywinmake',
+                    default=False, action='store_true',
+                    help='Build Jami for Windows using pywinmake')
 
     dist = choose_distribution()
 
@@ -686,6 +784,10 @@ def choose_distribution():
 def main():
     parsed_args = parse_args()
 
+    # Clean contribs if specified first.
+    if parsed_args.clean_contribs:
+        clean_contribs(parsed_args.clean_contribs)
+
     if parsed_args.dependencies:
         run_dependencies(parsed_args)
 

extras/build/cmake/modules/FindLibJami.cmake

@@ -53,33 +53,36 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll")
 
-# Add the lib prefix for Windows checks.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-  set(CMAKE_FIND_LIBRARY_PREFIXES "lib;")
-endif()
+set(LIBJAMI_NAMES
+  jami-core
+  jami
+  ring
+)
 
 if(WITH_DAEMON_SUBMODULE)
-  find_library(LIBJAMI_LIB NAMES jami ring
+  find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
     PATHS ${DAEMON_DIR}/src/.libs
     PATHS ${CMAKE_INSTALL_PREFIX}/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/libexec
     PATHS ${CMAKE_INSTALL_PREFIX}/bin
+    PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/bin
     NO_DEFAULT_PATH)
 else()
   # Search only in these given PATHS.
-  find_library(LIBJAMI_LIB NAMES jami ring
+  find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
     PATHS ${LIBJAMI_BUILD_DIR}/.libs
     PATHS ${RING_BUILD_DIR}/.libs
     PATHS ${CMAKE_INSTALL_PREFIX}/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
     PATHS ${CMAKE_INSTALL_PREFIX}/libexec
     PATHS ${CMAKE_INSTALL_PREFIX}/bin
+    PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/bin
     NO_DEFAULT_PATH)
 
   # Search elsewhere as well (e.g. system-wide).
   if(NOT LIBJAMI_LIB)
-    find_library(LIBJAMI_LIB NAMES jami ring)
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES})
   endif()
 endif()
 
@@ -88,27 +91,29 @@ if(NOT LIBJAMI_LIB)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib")
 
   if(WITH_DAEMON_SUBMODULE)
-    find_library(LIBJAMI_LIB NAMES jami ring
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
       PATHS ${DAEMON_DIR}/src/.libs
       PATHS ${CMAKE_INSTALL_PREFIX}
       PATHS ${CMAKE_INSTALL_PREFIX}/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+      PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/lib
       NO_DEFAULT_PATH)
   else()
     # Search only in these given PATHS.
-    find_library(LIBJAMI_LIB NAMES jami ring
+    find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES}
       PATHS ${LIBJAMI_BUILD_DIR}/.libs
       PATHS ${RING_BUILD_DIR}/.libs
       PATHS ${CMAKE_INSTALL_PREFIX}
       PATHS ${CMAKE_INSTALL_PREFIX}/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/daemon/lib
       PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+      PATHS ${CMAKE_INSTALL_PREFIX}/daemon/build/lib
       NO_DEFAULT_PATH)
 
     # Search elsewhere as well (e.g. system-wide).
     if(NOT LIBJAMI_LIB)
-      find_library(LIBJAMI_LIB NAMES jami ring)
+      find_library(LIBJAMI_LIB NAMES ${LIBJAMI_NAMES})
     endif()
 
     if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")

extras/packaging/gnu-linux/Makefile

@@ -46,10 +46,10 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
 
 # Qt versions
 QT_MAJOR := 6
-QT_MINOR := 4
+QT_MINOR := 5
 QT_PATCH := 3
-QT_TARBALL_CHECKSUM := 29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4
-DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-2
+QT_TARBALL_CHECKSUM := 7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb
+DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-0
 DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
 QT_JAMI_PREFIX := /usr/lib/libqt-jami
 
@@ -167,8 +167,11 @@ DISTRIBUTIONS := \
 	ubuntu_20.04 \
 	ubuntu_22.04 \
 	ubuntu_23.04 \
+	ubuntu_23.10 \
 	fedora_37 \
 	fedora_38 \
+	fedora_39 \
+	alma_9 \
 	opensuse-leap_15.4 \
 	snap
 

extras/packaging/gnu-linux/docker/Dockerfile_alma_9

@@ -0,0 +1,105 @@
+FROM almalinux:9
+RUN dnf clean all
+RUN dnf update -y
+RUN dnf install -y epel-release
+RUN dnf install -y 'dnf-command(config-manager)'
+RUN dnf config-manager --set-enabled crb
+RUN dnf config-manager --set-enabled appstream
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+RUN yum install -y wget && \
+    wget https://repo.almalinux.org/almalinux/9/devel/x86_64/os/Packages/uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \
+    yum localinstall -y uuid-c++-devel-1.6.2-55.el9.x86_64.rpm && \
+    rm -f uuid-c++-devel-1.6.2-55.el9.x86_64.rpm
+RUN yum install -y xorg-x11-xauth
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3-html5lib \
+        cups-devel
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_debian_11

@@ -18,7 +18,7 @@ RUN /opt/prebuild-package-debian.sh qt-deps
 COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
 RUN /opt/prebuild-package-debian.sh jami-deps
 
-# Install CMake 3.19 for Qt 6
+# Install CMake 3.20 for Qt 6
 ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
 RUN /opt/install-cmake.sh
 

extras/packaging/gnu-linux/docker/Dockerfile_fedora_39

@@ -0,0 +1,104 @@
+FROM fedora:39
+
+RUN dnf clean all
+RUN dnf update -y
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf groupinstall -y "X Software Development"
+
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        speex-devel \
+        gsm-devel \
+        chrpath \
+        check \
+        astyle \
+        uuid-c++-devel \
+        gettext-devel \
+        gcc-c++ \
+        which \
+        alsa-lib-devel \
+        systemd-devel \
+        libuuid-devel \
+        uuid-devel \
+        gnutls-devel \
+        nettle-devel \
+        opus-devel \
+        patch \
+        jsoncpp-devel \
+        libnatpmp-devel \
+        webkitgtk4-devel \
+        cryptopp-devel \
+        libva-devel \
+        libvdpau-devel \
+        msgpack-devel \
+        NetworkManager-libnm-devel \
+        openssl-devel \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake \
+        fmt-devel \
+        python3.10 \
+        cups-devel
+
+ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+
+CMD ["/opt/build-package-rpm.sh"]

extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4

@@ -70,6 +70,8 @@ RUN zypper --non-interactive install -y \
         nodejs12 \
         mozilla-nss-devel \
         python-xml \
+        python3-six \
+        python3-importlib-metadata \
         libxcb* \
         libxkb* \
         libX11-devel \

extras/packaging/gnu-linux/docker/Dockerfile_ubuntu_23.10

@@ -0,0 +1,22 @@
+FROM ubuntu:23.10
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retries=10 \
+        devscripts \
+        equivs \
+        python-is-python3 \
+        wget
+
+ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
+
+COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh qt-deps
+
+COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh jami-deps
+
+ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
+CMD ["/opt/build-package-debian.sh"]

extras/packaging/gnu-linux/rules/debian-qt/control

@@ -53,6 +53,7 @@ Build-Depends: debhelper (>= 9),
                libvulkan-dev [linux-any],
                libx11-dev,
                libx11-xcb-dev,
+               libsm-dev,
                libxcb-glx0-dev,
                libxcb-icccm4-dev,
                libxcb-image0-dev,
@@ -298,10 +299,11 @@ Build-Depends: debhelper (>= 9),
 # libvpx-dev (>= 1.8),
                libvpx-dev,
                libwebp-dev,
-# libx11-xcb-dev,
+               libx11-xcb-dev,
                libxcb-dri3-dev,
 # libxcomposite-dev,
                libxcursor-dev,
+               libxcb-cursor-dev,
                libxdamage-dev,
                libxml2-dev,
                libxnvctrl-dev,

extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-gcc13.patch

@@ -1,740 +0,0 @@
- qtwebengine/src/3rdparty/chromium/base/debug/profiler.h                                                            | 1 +
- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h                                                         | 1 +
- qtwebengine/src/3rdparty/chromium/base/logging.h                                                                   | 2 ++
- qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc                                                      | 2 ++
- qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h                               | 1 +
- qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h                          | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc                                | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h                                 | 1 +
- qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h                                     | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h                        | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/common/constants.h                                                    | 2 ++
- qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h                             | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h                                     | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h                                                    | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h                                                     | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h                                                            | 2 ++
- qtwebengine/src/3rdparty/chromium/net/base/parse_number.h                                                          | 1 +
- qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h                                            | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h                   | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h                 | 1 +
- qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h                                                   | 1 +
- qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h                        | 6 ++++--
- qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h              | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h                                   | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h          | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h                   | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h  | 4 ++--
- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h     | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h                                      | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h                        | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h                                    | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h                                    | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h                                 | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc                                  | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h                                  | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp                                      | 4 ++++
- qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h                       | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h                                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h                          | 1 +
- qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h                                                | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h                                                   | 2 ++
- qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h                                                | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h                                                            | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h                                                             | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h                                         | 1 +
- qtwebengine/src/core/browsing_data_remover_delegate_qt.h                                                           | 2 ++
- 54 files changed, 71 insertions(+), 5 deletions(-)
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-index 1229e06234..c7ed55e70f 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_PROFILER_H_
- #define BASE_DEBUG_PROFILER_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- 
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-index 60c3c5c474..6c8021cfde 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index a3ff92f0fd..c272f796a9 100644
---- a/qtwebengine/src/3rdparty/chromium/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
-@@ -7,6 +7,8 @@
- 
- #include <stddef.h>
- 
-+
-+#include <cstdint>
- #include <cassert>
- #include <cstdint>
- #include <sstream>
-diff --git a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-index 96f8c3bd7c..c3f087b1a9 100644
---- a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -6,6 +6,8 @@
- 
- #include "ui/gfx/animation/keyframe/target_property.h"
- 
-+#include <cstdint>
-+
- namespace cc {
- 
- static_assert(TargetProperty::LAST_TARGET_PROPERTY <
-diff --git a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index 2aba73ebcb..2e028fddcf 100644
---- a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index 3069c858d3..f4614b73c6 100644
---- a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-index 80fd26f4f4..3f08972a7a 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include "device/base/synchronization/one_writer_seqlock.h"
-+#include <cstdint>
- 
- #include "base/threading/platform_thread.h"
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 6a3eeda565..525301379c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
- 
- #include <atomic>
-+#include <cstdint>
- 
- #include "base/atomicops.h"
- #include "base/check.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 3cf2914e10..4b0552440c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- 
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-index c24205c402..ee67ecf189 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 9ac68e2be9..ef2761020d 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -10,6 +10,8 @@
- #include "build/chromeos_buildflags.h"
- #include "extensions/common/extensions_export.h"
- 
-+#include <cstdint>
-+
- namespace extensions {
- 
- // Scheme we serve extension content from.
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index 4ba8de8460..6352b90196 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- 
-+#include <cstdint>
- #include <set>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-index a9c7adb5b5..943bd4e470 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-@@ -7,6 +7,8 @@
- 
- #include <stdint.h>
- 
-+#include <cstdint>
-+
- namespace gpu {
- namespace webgpu {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 027f1a5af3..70759b2ae4 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-index 3ea2191b50..0a1ae11202 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
- #define GPU_CONFIG_GPU_PREFERENCES_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-index f72970c67a..d7f0b7d492 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
- 
-+#include <cstdint>
-+
- #include "build/build_config.h"
- #include "gpu/config/gpu_feature_info.h"
- #include "gpu/gpu_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-index 4e49ab7112..e99d2dd7aa 100644
---- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -7,6 +7,7 @@
- 
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-+#include <cstdint>
- 
- // This file contains utility functions for parsing numbers, in the context of
- // network protocols.
-diff --git a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 2e9c319a3d..4d723d18f2 100644
---- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- 
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0c0..3e30f1cb02 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- 
-+#include <cstdint>
- #include <vector>
- 
- #include "absl/strings/string_view.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f1501728..db4d310849 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 138ca2efec..08f06e7b8c 100644
---- a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- 
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-index b4fdb9a6d3..375d3ef327 100644
---- a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-+++ b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-@@ -38,6 +38,10 @@ namespace pp {
- /// As a further optimization, we can add support for this later.
- class ThreadSafeThreadTraits {
-  public:
-+
-+  typedef pp::Lock Lock;
-+  typedef pp::AutoLock AutoLock;
-+
-   class RefCount {
-    public:
-     /// Default constructor. In debug mode, this checks that the object is being
-@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
-     int32_t ref_;
-   };
- 
--  typedef pp::Lock Lock;
--  typedef pp::AutoLock AutoLock;
- };
- 
- /// The non-thread-safe version of thread traits. Using this class as the
-diff --git a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index 0aad3ac782..7f7a1057d7 100644
---- a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -5,6 +5,7 @@
- #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- 
-+#include <cstdint>
- #include <bitset>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-index c47536d63e..443f47afd0 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -18,6 +18,7 @@
- 
- #include <limits.h>
- 
-+#include <cstdint>
- #include <cstddef>
- #include <cstring>
- #include <ostream>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-index e13aa2221d..0ce848486d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-@@ -7,7 +7,7 @@
- #define GLSLANG_SHADERLANG_H_
- 
- #include <stddef.h>
--
-+#include <cstdint>
- #include "KHR/khrplatform.h"
- 
- #include <array>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 18175e15c7..28332857bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -14,6 +14,7 @@
- #include <array>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // This type is defined here to simplify ANGLE's integration with glslang for SPIR-V.
- using ShCompileOptions = uint64_t;
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c63049b174..82b27837b5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
- 
- #include <array>
-+#include <cstdint>
- 
- namespace blink {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-index 14c5548766..43c9a8d6a5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace blink {
- 
- enum class DarkModeResult : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index 80b3150b67..6377196230 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -116,7 +116,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
- 
-     // An identifier for a document transition shared element. `id.valid()`
-     // returns true if this has been set, and false otherwise.
--    DocumentTransitionSharedElementId document_transition_shared_element_id;
-+    cc::DocumentTransitionSharedElementId document_transition_shared_element_id;
- 
-     // An identifier to tag shared element resources generated and cached in the
-     // Viz process. This generated resource can be used as content for other
-@@ -285,7 +285,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
-     return state_.compositor_element_id;
-   }
- 
--  const blink::DocumentTransitionSharedElementId&
-+  const cc::DocumentTransitionSharedElementId&
-   DocumentTransitionSharedElementId() const {
-     return state_.document_transition_shared_element_id;
-   }
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-index c7e4f2b378..f30ce91b36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
- 
- #include <string>
-+#include <cstdint>
- 
- #include "client/linux/handler/microdump_extra_info.h"
- #include "common/using_std_string.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-index 2d58d76cb6..139af564ea 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-@@ -18,6 +18,7 @@
- #include "dawn/common/TypedInteger.h"
- #include "dawn/common/ityp_array.h"
- 
-+#include <cstdint>
- #include <bitset>
- #include <iostream>
- #include <limits>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-index 374bd8302a..0884eb2a19 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
- #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-index fa5fc3a7e9..6cec934670 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_NAMER_H_
- #define SRC_TINT_READER_SPIRV_NAMER_H_
- 
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-index f378d57817..98d1336f9a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_LEXER_H_
- #define SRC_TINT_READER_WGSL_LEXER_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "src/tint/reader/wgsl/token.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-index 7b5b6754ed..62b1ca7e36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_TOKEN_H_
- #define SRC_TINT_READER_WGSL_TOKEN_H_
- 
-+#include <cstdint>
- #include <string>
- #include <string_view>
- #include <variant>  // NOLINT: cpplint doesn't recognise this
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-index 4be648b37a..cac7238ef2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-@@ -14,6 +14,7 @@
- 
- #include "src/tint/writer/spirv/instruction.h"
- 
-+#include <cstdint>
- #include <utility>
- 
- namespace tint::writer::spirv {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-index 46a5deb55b..4c3080ff25 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_
- #define SRC_TINT_WRITER_SPIRV_OPERAND_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-index a3099e15db..2e6f0eea70 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -30,6 +30,7 @@
- #include <cstddef>
- #include <cstdint>
- #include <cstring>
-+#include <cstdio>
- #include <new>
- #include <utility>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731dac7a..46bc87ef92 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
- 
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c53815b..472042fabc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-index c56f0344f9..cd7824929e 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -20,6 +20,8 @@
- #include "perfetto/ext/base/optional.h"
- #include "perfetto/trace_processor/status.h"
- 
-+#include <cstdint>
-+
- namespace perfetto {
- 
- namespace protos {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-index 3164650728..512a26943d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -10,6 +10,10 @@
- 
- #include <algorithm> // std::lower_bound
- 
-+#include <string.h>
-+#include <algorithm>
-+#include <iterator>
-+
- static constexpr const char* gColorNames[] = {
-     "aliceblue",
-     "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b80e..19ccbb024a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -146,6 +146,7 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
-     #endif // #if VMA_VULKAN_VERSION >= 1001000
- #endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
- 
-+#include <cstdio>
- #ifndef VULKAN_H_
-     #include <vulkan/vulkan.h>
- #endif
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-index 5fd37b4613..ce70405dd2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTP_DEMUXER_H_
- #define CALL_RTP_DEMUXER_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <utility>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-index b70ac4aa59..7ba5555647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-@@ -13,6 +13,7 @@
- 
- #include <gio/gio.h>
- 
-+#include <cstdint>
- #include <string>
- 
- namespace webrtc {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index ca249541d0..534214dbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-index 708d6c98ac..898016d886 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+#include <cstdint>
- #include "base/component_export.h"
- #include "ui/base/ime/text_input_type.h"
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-index d97a696fd5..68b18d80cd 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-@@ -5,6 +5,7 @@
- #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- 
-+#include <cstdint>
- #include <string.h>
- 
- #include "base/check_op.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index 7ff15f0fc5..136cebc09e 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- enum class ScrollGranularity : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 1ad025fec1..adadf96190 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -5,6 +5,7 @@
- #ifndef UI_GFX_LINEAR_GRADIENT_H_
- #define UI_GFX_LINEAR_GRADIENT_H_
- 
-+#include <cstdint>
- #include <array>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fdac44e31e..a752dba6a2 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
- 
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-index 61644ffe05..6fbc037437 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_MACROS_H_
- #define V8_BASE_MACROS_H_
- 
-+#include <cstdint>
- #include <limits>
- #include <type_traits>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-index c1d69c18f0..eb33c6816a 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-@@ -5,6 +5,7 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
-diff --git a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-index 4e690ffb19..dfa884cd65 100644
---- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-+++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -6,6 +6,8 @@
- 
- #include "content/public/browser/browsing_data_remover_delegate.h"
- 
-+#include <cstdint>
-+
- namespace QtWebEngineCore {
- 
- class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {

extras/packaging/gnu-linux/rules/debian-qt/patches/0001-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/debian-qt/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch

@@ -1,52 +0,0 @@
-From f4410fcbb093f259eaff4a20fc4266a535479235 Mon Sep 17 00:00:00 2001
-From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Mon, 29 May 2023 13:09:53 -0400
-Subject: [PATCH] OpenFile portal: do not use O_PATH fds
-
-Using O_PATH requires correctly specifying whether the fd is writable or
-not. Stating that the fd is writable without it actually being writable
-results into rejection on xdg-desktop-portal side. Other implementations
-like xdg-open or gtk have also moved away from O_PATH fds so this will
-make a matching implementation and avoid possible rejections from xdp.
-
-Fixes: QTBUG-113143
-Original: https://codereview.qt-project.org/c/qt/qtbase/+/475425
----
- qtbase/src/gui/platform/unix/qgenericunixservices.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-index a0e5466c58..fe0fdaa625 100644
---- a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-+++ b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-@@ -163,8 +163,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
-     // handle_token (s) -  A string that will be used as the last element of the @handle.
-     // writable (b) - Whether to allow the chosen application to write to the file.
- 
--#ifdef O_PATH
--    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
-+    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
-     if (fd != -1) {
-         QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
-                                                               "/org/freedesktop/portal/desktop"_L1,
-@@ -174,16 +173,13 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
-         QDBusUnixFileDescriptor descriptor;
-         descriptor.giveFileDescriptor(fd);
- 
--        const QVariantMap options = {{"writable"_L1, true}};
-+        const QVariantMap options = {};
- 
-         // FIXME parent_window_id
-         message << QString() << QVariant::fromValue(descriptor) << options;
- 
-         return QDBusConnection::sessionBus().call(message);
-     }
--#else
--    Q_UNUSED(url);
--#endif
- 
-     return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
- }
--- 
-2.40.1
-

extras/packaging/gnu-linux/rules/debian-qt/patches/0002-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/debian-qt/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/debian-qt/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/debian-qt/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/rules/debian-qt/patches/0015-remove-deleted-xkb-keys.patch

@@ -0,0 +1,45 @@
+diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
+index 8a2769a3ed..584d3620c9 100644
+--- a/qtbase/src/corelib/global/qnamespace.h
++++ b/qtbase/src/corelib/global/qnamespace.h
+@@ -832,10 +832,6 @@ namespace Qt {
+         Key_Dead_Small_Schwa    = 0x0100128a,
+         Key_Dead_Capital_Schwa  = 0x0100128b,
+         Key_Dead_Greek          = 0x0100128c,
+-        Key_Dead_Lowline        = 0x01001290,
+-        Key_Dead_Aboveverticalline = 0x01001291,
+-        Key_Dead_Belowverticalline = 0x01001292,
+-        Key_Dead_Longsolidusoverlay = 0x01001293,
+
+         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
+         Key_Back  = 0x01000061,
+diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
+index 78c69176d8..1623517b5a 100644
+--- a/qtbase/src/corelib/global/qnamespace.qdoc
++++ b/qtbase/src/corelib/global/qnamespace.qdoc
+@@ -1654,10 +1654,6 @@
+     \value Key_Dead_Small_Schwa
+     \value Key_Dead_Capital_Schwa
+     \value Key_Dead_Greek
+-    \value Key_Dead_Lowline
+-    \value Key_Dead_Aboveverticalline
+-    \value Key_Dead_Belowverticalline
+-    \value Key_Dead_Longsolidusoverlay
+     \value Key_Back
+     \value Key_Forward
+     \value Key_Stop
+diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+index fc014b38e2..af1cbbd42a 100644
+--- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
++++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
+-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.

extras/packaging/gnu-linux/rules/debian-qt/patches/0016-fix-vaapi.patch

@@ -0,0 +1,29 @@
+ qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+index ec212f5a35..58bf4dce7d 100644
+--- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
++++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+@@ -37,7 +37,10 @@ static Libs loadLibs()
+     return {};
+ }
+ 
+-constexpr size_t symbolsCount = 39
++constexpr size_t symbolsCount = 38
++#if VA_CHECK_VERSION(1, 9, 0)
++        + 1
++#endif
+ #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
+         + 1
+ #endif
+@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
++#if VA_CHECK_VERSION(1, 9, 0)
+ DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
++#endif
+ DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ 
+ DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);

extras/packaging/gnu-linux/rules/debian-qt/patches/series

@@ -1,2 +1,4 @@
-0001-fix-gcc13.patch
-0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+0001-fix-mathops.patch
+0002-fix-binary-tokenizer.patch
+0015-remove-deleted-xkb-keys.patch
+0016-fix-vaapi.patch

extras/packaging/gnu-linux/rules/debian/control

@@ -68,7 +68,7 @@ Depends: gnupg,
 Replaces: jami,
           jami-libclient,
           jami-daemon,
-          libqt-jami (>= 6.4.3),
+          libqt-jami (>= 6.5.3),
 Conflicts: jami,
            jami-libclient,
            jami-libclient-gnome,
@@ -84,7 +84,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          jami-daemon (=${binary:Version}),
-         libqt-jami (>= 6.4.3)
+         libqt-jami (>= 6.5.3)
 Provides: jami-qt
 Replaces: jami-all,
           jami-libclient (<= 20220516.0214.9b42ad3~dfsg1-1)

extras/packaging/gnu-linux/rules/debian/jami-all.postinst

@@ -101,6 +101,8 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_22.04"
     elif [ "${UBUNTU_CODENAME}" = "lunar" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.04" ]; then
         ENDTAG="ubuntu_23.04"
+    elif [ "${UBUNTU_CODENAME}" = "mantic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_23.10" ]; then
+        ENDTAG="ubuntu_23.10"
     elif [ "${ID}" = "debian" ] && \
              [ "$(command -v lsb_release)" ] && \
              [ "$(lsb_release -rs)" = "testing" ]; then

extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec

@@ -26,8 +26,10 @@ License:       GPLv3+
 Vendor:        Savoir-faire Linux Inc.
 URL:           https://jami.net/
 Source:        jami-libqt-%{version}.tar.xz
-Patch0:        0001-fix-gcc13.patch
-Patch1:        0002-OpenFile-portal-do-not-use-O_PATH-fds.patch
+Patch0:        0001-fix-mathops.patch
+Patch1:        0002-fix-binary-tokenizer.patch
+Patch2:        0015-remove-deleted-xkb-keys.patch
+Patch3:        0016-fix-vaapi.patch
 
 %global gst 0.10
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -48,6 +50,7 @@ BuildRequires: ffmpeg
 BuildRequires: python-xml
 BuildRequires: mozilla-nss-devel
 %else
+BuildRequires: python-six
 BuildRequires: pkgconfig(gstreamer-%{gst})
 BuildRequires: pkgconfig(gstreamer-app-%{gst})
 BuildRequires: pkgconfig(gstreamer-audio-%{gst})
@@ -64,6 +67,8 @@ This package contains Qt libraries for Jami.
 %setup -n qt-everywhere-src-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 echo "Building Qt using %{job_count} parallel jobs"
@@ -84,6 +89,15 @@ cat qtbase/src/corelib/global/qendian.h
 sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/src/corelib/global/qfloat16.h
 sed -i 's,#include <QtCore/qbytearray.h>,#include <QtCore/qbytearray.h>\n#include <limits>,g' qtbase/src/corelib/text/qbytearraymatcher.h
 cat qtwebengine/configure.cmake
+
+#https://bugreports.qt.io/browse/QTBUG-117979
+if test -f "/usr/bin/python3.10"; then
+  /usr/bin/python3.10 -m venv env
+  source env/bin/activate
+  python -m pip install html5lib
+  python -m pip install six
+fi
+
 # recent gcc version do not like lto from qt
 CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \
   -opensource \

extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-gcc13.patch

@@ -1,740 +0,0 @@
- qtwebengine/src/3rdparty/chromium/base/debug/profiler.h                                                            | 1 +
- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h                                                         | 1 +
- qtwebengine/src/3rdparty/chromium/base/logging.h                                                                   | 2 ++
- qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc                                                      | 2 ++
- qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h                               | 1 +
- qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h                          | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc                                | 1 +
- qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h                                 | 1 +
- qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h                                     | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h                        | 1 +
- qtwebengine/src/3rdparty/chromium/extensions/common/constants.h                                                    | 2 ++
- qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h                             | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h                                     | 2 ++
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h                                                    | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h                                                     | 1 +
- qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h                                                            | 2 ++
- qtwebengine/src/3rdparty/chromium/net/base/parse_number.h                                                          | 1 +
- qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h                                            | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h                   | 1 +
- qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h                 | 1 +
- qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h                                                   | 1 +
- qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h                        | 6 ++++--
- qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h              | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h                                   | 2 +-
- qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h          | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h                   | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h  | 4 ++--
- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h     | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h                                      | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h                        | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h                                    | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h                                    | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h                                 | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc                                  | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h                                  | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h | 2 ++
- qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp                                      | 4 ++++
- qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h                       | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h                                            | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h   | 1 +
- qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h                          | 1 +
- qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h                                   | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h                                                | 1 +
- qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h                                                   | 2 ++
- qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h                                                | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h                                                            | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h                                                             | 1 +
- qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h                                         | 1 +
- qtwebengine/src/core/browsing_data_remover_delegate_qt.h                                                           | 2 ++
- 54 files changed, 71 insertions(+), 5 deletions(-)
-
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-index 1229e06234..c7ed55e70f 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h
-@@ -5,6 +5,7 @@
- #ifndef BASE_DEBUG_PROFILER_H_
- #define BASE_DEBUG_PROFILER_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- 
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-index 60c3c5c474..6c8021cfde 100644
---- a/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/debug/stack_trace.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <iosfwd>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/base/logging.h b/qtwebengine/src/3rdparty/chromium/base/logging.h
-index a3ff92f0fd..c272f796a9 100644
---- a/qtwebengine/src/3rdparty/chromium/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/base/logging.h
-@@ -7,6 +7,8 @@
- 
- #include <stddef.h>
- 
-+
-+#include <cstdint>
- #include <cassert>
- #include <cstdint>
- #include <sstream>
-diff --git a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-index 96f8c3bd7c..c3f087b1a9 100644
---- a/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-+++ b/qtwebengine/src/3rdparty/chromium/cc/trees/target_property.cc
-@@ -6,6 +6,8 @@
- 
- #include "ui/gfx/animation/keyframe/target_property.h"
- 
-+#include <cstdint>
-+
- namespace cc {
- 
- static_assert(TargetProperty::LAST_TARGET_PROPERTY <
-diff --git a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-index 2aba73ebcb..2e028fddcf 100644
---- a/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/components/viz/common/shared_element_resource_id.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_SHARED_ELEMENT_RESOURCE_ID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-index 3069c858d3..f4614b73c6 100644
---- a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-+++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- #include "base/callback_forward.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-index 80fd26f4f4..3f08972a7a 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include "device/base/synchronization/one_writer_seqlock.h"
-+#include <cstdint>
- 
- #include "base/threading/platform_thread.h"
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-index 6a3eeda565..525301379c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
- 
- #include <atomic>
-+#include <cstdint>
- 
- #include "base/atomicops.h"
- #include "base/check.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-index 3cf2914e10..4b0552440c 100644
---- a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- 
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-index c24205c402..ee67ecf189 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/audio/audio_device_id_calculator.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- #define EXTENSIONS_BROWSER_API_AUDIO_AUDIO_DEVICE_ID_CALCULATOR_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-index 9ac68e2be9..ef2761020d 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/common/constants.h
-@@ -10,6 +10,8 @@
- #include "build/chromeos_buildflags.h"
- #include "extensions/common/extensions_export.h"
- 
-+#include <cstdint>
-+
- namespace extensions {
- 
- // Scheme we serve extension content from.
-diff --git a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-index 4ba8de8460..6352b90196 100644
---- a/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/qtwebengine/src/3rdparty/chromium/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- 
-+#include <cstdint>
- #include <set>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-index a9c7adb5b5..943bd4e470 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h
-@@ -7,6 +7,8 @@
- 
- #include <stdint.h>
- 
-+#include <cstdint>
-+
- namespace gpu {
- namespace webgpu {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-index 027f1a5af3..70759b2ae4 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-index 3ea2191b50..0a1ae11202 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_PREFERENCES_H_
- #define GPU_CONFIG_GPU_PREFERENCES_H_
- 
-+#include <cstdint>
- #include <stddef.h>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-index f72970c67a..d7f0b7d492 100644
---- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
- 
-+#include <cstdint>
-+
- #include "build/build_config.h"
- #include "gpu/config/gpu_feature_info.h"
- #include "gpu/gpu_export.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-index 4e49ab7112..e99d2dd7aa 100644
---- a/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/base/parse_number.h
-@@ -7,6 +7,7 @@
- 
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
-+#include <cstdint>
- 
- // This file contains utility functions for parsing numbers, in the context of
- // network protocols.
-diff --git a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-index 2e9c319a3d..4d723d18f2 100644
---- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- 
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-index 6a300ed0c0..3e30f1cb02 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- #define QUICHE_QUIC_CORE_CRYPTO_QUIC_HKDF_H_
- 
-+#include <cstdint>
- #include <vector>
- 
- #include "absl/strings/string_view.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-index 52f1501728..db4d310849 100644
---- a/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-+++ b/qtwebengine/src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h
-@@ -5,6 +5,7 @@
- #ifndef QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- #define QUICHE_QUIC_CORE_QUIC_CONNECTION_ID_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-index 138ca2efec..08f06e7b8c 100644
---- a/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- 
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-index b4fdb9a6d3..375d3ef327 100644
---- a/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-+++ b/qtwebengine/src/3rdparty/chromium/ppapi/utility/completion_callback_factory_thread_traits.h
-@@ -38,6 +38,10 @@ namespace pp {
- /// As a further optimization, we can add support for this later.
- class ThreadSafeThreadTraits {
-  public:
-+
-+  typedef pp::Lock Lock;
-+  typedef pp::AutoLock AutoLock;
-+
-   class RefCount {
-    public:
-     /// Default constructor. In debug mode, this checks that the object is being
-@@ -67,8 +71,6 @@ class ThreadSafeThreadTraits {
-     int32_t ref_;
-   };
- 
--  typedef pp::Lock Lock;
--  typedef pp::AutoLock AutoLock;
- };
- 
- /// The non-thread-safe version of thread traits. Using this class as the
-diff --git a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-index 0aad3ac782..7f7a1057d7 100644
---- a/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/qtwebengine/src/3rdparty/chromium/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -5,6 +5,7 @@
- #ifndef SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- 
-+#include <cstdint>
- #include <bitset>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-index c47536d63e..443f47afd0 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h
-@@ -18,6 +18,7 @@
- 
- #include <limits.h>
- 
-+#include <cstdint>
- #include <cstddef>
- #include <cstring>
- #include <ostream>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-index e13aa2221d..0ce848486d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderLang.h
-@@ -7,7 +7,7 @@
- #define GLSLANG_SHADERLANG_H_
- 
- #include <stddef.h>
--
-+#include <cstdint>
- #include "KHR/khrplatform.h"
- 
- #include <array>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-index 18175e15c7..28332857bc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h
-@@ -14,6 +14,7 @@
- #include <array>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- // This type is defined here to simplify ANGLE's integration with glslang for SPIR-V.
- using ShCompileOptions = uint64_t;
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c63049b174..82b27837b5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
- 
- #include <array>
-+#include <cstdint>
- 
- namespace blink {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-index 14c5548766..43c9a8d6a5 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace blink {
- 
- enum class DarkModeResult : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-index 80b3150b67..6377196230 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h
-@@ -116,7 +116,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
- 
-     // An identifier for a document transition shared element. `id.valid()`
-     // returns true if this has been set, and false otherwise.
--    DocumentTransitionSharedElementId document_transition_shared_element_id;
-+    cc::DocumentTransitionSharedElementId document_transition_shared_element_id;
- 
-     // An identifier to tag shared element resources generated and cached in the
-     // Viz process. This generated resource can be used as content for other
-@@ -285,7 +285,7 @@ class PLATFORM_EXPORT EffectPaintPropertyNode
-     return state_.compositor_element_id;
-   }
- 
--  const blink::DocumentTransitionSharedElementId&
-+  const cc::DocumentTransitionSharedElementId&
-   DocumentTransitionSharedElementId() const {
-     return state_.document_transition_shared_element_id;
-   }
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-index c7e4f2b378..f30ce91b36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
- 
- #include <string>
-+#include <cstdint>
- 
- #include "client/linux/handler/microdump_extra_info.h"
- #include "common/using_std_string.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-index 2d58d76cb6..139af564ea 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h
-@@ -18,6 +18,7 @@
- #include "dawn/common/TypedInteger.h"
- #include "dawn/common/ityp_array.h"
- 
-+#include <cstdint>
- #include <bitset>
- #include <iostream>
- #include <limits>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-index 374bd8302a..0884eb2a19 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
- #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-index fa5fc3a7e9..6cec934670 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_SPIRV_NAMER_H_
- #define SRC_TINT_READER_SPIRV_NAMER_H_
- 
-+#include <cstdint>
- #include <string>
- #include <unordered_map>
- #include <vector>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-index f378d57817..98d1336f9a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_LEXER_H_
- #define SRC_TINT_READER_WGSL_LEXER_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "src/tint/reader/wgsl/token.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-index 7b5b6754ed..62b1ca7e36 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_READER_WGSL_TOKEN_H_
- #define SRC_TINT_READER_WGSL_TOKEN_H_
- 
-+#include <cstdint>
- #include <string>
- #include <string_view>
- #include <variant>  // NOLINT: cpplint doesn't recognise this
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-index 4be648b37a..cac7238ef2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/instruction.cc
-@@ -14,6 +14,7 @@
- 
- #include "src/tint/writer/spirv/instruction.h"
- 
-+#include <cstdint>
- #include <utility>
- 
- namespace tint::writer::spirv {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-index 46a5deb55b..4c3080ff25 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_
- #define SRC_TINT_WRITER_SPIRV_OPERAND_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-index a3099e15db..2e6f0eea70 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc
-@@ -30,6 +30,7 @@
- #include <cstddef>
- #include <cstdint>
- #include <cstring>
-+#include <cstdio>
- #include <new>
- #include <utility>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-index d2731dac7a..46bc87ef92 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
- 
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-index 1b4c53815b..472042fabc 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
- 
- #include <array>
-+#include <cstdint>
- #include <string>
- 
- #include "perfetto/ext/base/optional.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-index c56f0344f9..cd7824929e 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h
-@@ -20,6 +20,8 @@
- #include "perfetto/ext/base/optional.h"
- #include "perfetto/trace_processor/status.h"
- 
-+#include <cstdint>
-+
- namespace perfetto {
- 
- namespace protos {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-index 3164650728..512a26943d 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -10,6 +10,10 @@
- 
- #include <algorithm> // std::lower_bound
- 
-+#include <string.h>
-+#include <algorithm>
-+#include <iterator>
-+
- static constexpr const char* gColorNames[] = {
-     "aliceblue",
-     "antiquewhite",
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-index b7c586b80e..19ccbb024a 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
-@@ -146,6 +146,7 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
-     #endif // #if VMA_VULKAN_VERSION >= 1001000
- #endif // #if defined(__ANDROID__) && VMA_STATIC_VULKAN_FUNCTIONS && VK_NO_PROTOTYPES
- 
-+#include <cstdio>
- #ifndef VULKAN_H_
-     #include <vulkan/vulkan.h>
- #endif
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-index 5fd37b4613..ce70405dd2 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h
-@@ -11,6 +11,7 @@
- #ifndef CALL_RTP_DEMUXER_H_
- #define CALL_RTP_DEMUXER_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <utility>
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-index b70ac4aa59..7ba5555647 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h
-@@ -13,6 +13,7 @@
- 
- #include <gio/gio.h>
- 
-+#include <cstdint>
- #include <string>
- 
- namespace webrtc {
-diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-index ca249541d0..534214dbfa 100644
---- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-+++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h
-@@ -12,6 +12,7 @@
- #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-index 708d6c98ac..898016d886 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/base/ime/linux/linux_input_method_context.h
-@@ -8,6 +8,7 @@
- #include <string>
- #include <vector>
- 
-+#include <cstdint>
- #include "base/component_export.h"
- #include "ui/base/ime/text_input_type.h"
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-index d97a696fd5..68b18d80cd 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/gesture_event_details.h
-@@ -5,6 +5,7 @@
- #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_
- 
-+#include <cstdint>
- #include <string.h>
- 
- #include "base/check_op.h"
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-index 7ff15f0fc5..136cebc09e 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- enum class ScrollGranularity : uint8_t {
-diff --git a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-index 1ad025fec1..adadf96190 100644
---- a/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-+++ b/qtwebengine/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h
-@@ -5,6 +5,7 @@
- #ifndef UI_GFX_LINEAR_GRADIENT_H_
- #define UI_GFX_LINEAR_GRADIENT_H_
- 
-+#include <cstdint>
- #include <array>
- #include <string>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-index fdac44e31e..a752dba6a2 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_LOGGING_H_
- #define V8_BASE_LOGGING_H_
- 
-+#include <cstdint>
- #include <cstring>
- #include <sstream>
- #include <string>
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-index 61644ffe05..6fbc037437 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h
-@@ -5,6 +5,7 @@
- #ifndef V8_BASE_MACROS_H_
- #define V8_BASE_MACROS_H_
- 
-+#include <cstdint>
- #include <limits>
- #include <type_traits>
- 
-diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-index c1d69c18f0..eb33c6816a 100644
---- a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-+++ b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h
-@@ -5,6 +5,7 @@
- #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
-diff --git a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-index 4e690ffb19..dfa884cd65 100644
---- a/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-+++ b/qtwebengine/src/core/browsing_data_remover_delegate_qt.h
-@@ -6,6 +6,8 @@
- 
- #include "content/public/browser/browsing_data_remover_delegate.h"
- 
-+#include <cstdint>
-+
- namespace QtWebEngineCore {
- 
- class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate {

extras/packaging/gnu-linux/rules/rpm/patches/0001-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/rpm/patches/0002-OpenFile-portal-do-not-use-O_PATH-fds.patch

@@ -1,52 +0,0 @@
-From f4410fcbb093f259eaff4a20fc4266a535479235 Mon Sep 17 00:00:00 2001
-From: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Mon, 29 May 2023 13:09:53 -0400
-Subject: [PATCH] OpenFile portal: do not use O_PATH fds
-
-Using O_PATH requires correctly specifying whether the fd is writable or
-not. Stating that the fd is writable without it actually being writable
-results into rejection on xdg-desktop-portal side. Other implementations
-like xdg-open or gtk have also moved away from O_PATH fds so this will
-make a matching implementation and avoid possible rejections from xdp.
-
-Fixes: QTBUG-113143
-Original: https://codereview.qt-project.org/c/qt/qtbase/+/475425
----
- qtbase/src/gui/platform/unix/qgenericunixservices.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-index a0e5466c58..fe0fdaa625 100644
---- a/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-+++ b/qtbase/src/gui/platform/unix/qgenericunixservices.cpp
-@@ -163,8 +163,7 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
-     // handle_token (s) -  A string that will be used as the last element of the @handle.
-     // writable (b) - Whether to allow the chosen application to write to the file.
- 
--#ifdef O_PATH
--    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
-+    const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_RDONLY);
-     if (fd != -1) {
-         QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
-                                                               "/org/freedesktop/portal/desktop"_L1,
-@@ -174,16 +173,13 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
-         QDBusUnixFileDescriptor descriptor;
-         descriptor.giveFileDescriptor(fd);
- 
--        const QVariantMap options = {{"writable"_L1, true}};
-+        const QVariantMap options = {};
- 
-         // FIXME parent_window_id
-         message << QString() << QVariant::fromValue(descriptor) << options;
- 
-         return QDBusConnection::sessionBus().call(message);
-     }
--#else
--    Q_UNUSED(url);
--#endif
- 
-     return QDBusMessage::createError(QDBusError::InternalError, qt_error_string());
- }
--- 
-2.40.1
-

extras/packaging/gnu-linux/rules/rpm/patches/0002-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0003-fix-mathops.patch

@@ -0,0 +1,81 @@
+From ecae5d93b0a89e2b8c16a2227b2d176f58579d04 Mon Sep 17 00:00:00 2001
+From: Rémi Denis-Courmont <remi@remlab.net>
+Date: Sun, 16 Jul 2023 18:18:02 +0300
+Subject: [PATCH] Fix ffmpeg assembly with newer binutil
+
+avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
+
+Fixes assembling with binutil as >= 2.41
+
+FFmpeg commit effadce6c756247ea8bae32dc13bb3e6f464f0eb.
+
+Deals with: "Error: operand type mismatch for `shr'"
+
+Fixes: QTBUG-116649
+Change-Id: I094e8c23fed4a61fba3f1e3a9c73c016d129d830
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495990
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+(cherry picked from commit 29354c7c7def7bdc66bcd25d401677fd9421f657)
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/509219
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+index 6298f5e..ca7e2df 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+
+@@ -113,19 +121,31 @@
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }

extras/packaging/gnu-linux/rules/rpm/patches/0004-fix-binary-tokenizer.patch

@@ -0,0 +1,16 @@
+ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+index 3488120..120e47a 100644
+--- a/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
++++ b/qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
+@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
+     }
+     catch (const DeadlyImportError& e)
+     {
+-        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
++        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
+             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
+         }
+         throw;

extras/packaging/gnu-linux/rules/rpm/patches/0005-importlib.patch

@@ -0,0 +1,433 @@
+ qtbase/src/corelib/debug_script.py                                                                            | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py                       | 2 +-
+ qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py                                  | 2 +-
+ qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py                                   | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py                          | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py                         | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py                                | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py                      | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py                 | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py                                              | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py                    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py                                           | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py                                             | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py    | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py   | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py        | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py         | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py  | 2 +-
+ .../src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py       | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py   | 2 +-
+ .../3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py  | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py             | 2 +-
+ qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py            | 2 +-
+ qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py                                       | 2 +-
+ qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py                       | 2 +-
+ 31 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/qtbase/src/corelib/debug_script.py b/qtbase/src/corelib/debug_script.py
+index f6207c6104..663c8e0ac1 100644
+--- a/qtbase/src/corelib/debug_script.py
++++ b/qtbase/src/corelib/debug_script.py
+@@ -3,7 +3,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+
+ from distutils.version import LooseVersion
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d34b..a1fe56fa05 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -16,7 +16,7 @@ import subprocess
+ import sys
+ import tempfile
+ import time
+-import imp
++import importlib
+
+ # from TestCasePackagerConfig import *
+
+diff --git a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e6139b..7a18e12ced 100644
+--- a/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
++++ b/qtdeclarative/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -7,7 +7,7 @@ import unittest
+
+ import os
+ import yaml
+-import imp
++import importlib
+
+ # add parent dir to search path
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+index c7412927c8..ad2caff318 100755
+--- a/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
++++ b/qtwebengine/src/3rdparty/chromium/chrome/browser/resources/PRESUBMIT_test.py
+@@ -5,7 +5,7 @@
+
+ import os
+ import sys
+-import imp
++import importlib
+ import tempfile
+ import unittest
+ import PRESUBMIT
+diff --git a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+index 5daee773ba..2d6b124162 100755
+--- a/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
++++ b/qtwebengine/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py
+@@ -9,7 +9,7 @@
+ """
+ from __future__ import print_function
+ import abc
+-import imp
++import importlib
+ import optparse
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+index bf626f5479..3fae129aaa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil.py
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+
+ import errno
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+index ff5753a291..04fc34f742 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/fileutil_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import shutil
+ import sys
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+index 32c884a8c0..e761faa54c 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/generator_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+index 95a916db08..4331e2fbfa 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/generate/translate_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+index 62798631db..28e9dbf705 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/ast_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+index cba249b0f3..5a4051827a 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+index 4a2fefc712..11a9879cb7 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+index cc17ae0253..bcc944f06b 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+index bd72830e54..f2fdc9ae28 100644
+--- a/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/mojo/public/tools/mojom/mojom/parse/parser_unittest.py
+@@ -2,7 +2,7 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+
+-import imp
++import importlib
+ import os.path
+ import sys
+ import unittest
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+index 1feb303a48..8428de61bb 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/scripts/angle_presubmit_utils_unittest.py
+@@ -6,7 +6,7 @@
+ angle_presubmit_utils_unittest.py: Top-level unittest script for ANGLE presubmit checks.
+ """
+
+-import imp
++import importlib
+ import os
+ import unittest
+ from angle_presubmit_utils import *
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+index ed4f38c67b..cac734cefa 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/PRESUBMIT.py
+@@ -7,7 +7,7 @@ See https://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+ for more details about the presubmit API built into gcl.
+ """
+
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+index 0244c9787e..f535afe99c 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/flatbuffers/src/python/flatbuffers/compat.py
+@@ -32,7 +32,7 @@ if PY3:
+     memoryview_type = memoryview
+     struct_bool_decl = "?"
+ else:
+-    import imp
++    import importlib
+     string_types = (unicode,)
+     if PY26 or PY27:
+         binary_types = (str,bytearray)
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+index 8430390eea..29212205bc 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/jinja2/environment.py
+@@ -732,7 +732,7 @@ class Environment(object):
+                 )
+                 py_compile = False
+             else:
+-                import imp
++                import importlib
+                 import marshal
+
+                 py_header = imp.get_magic() + u"\xff\xff\xff\xff".encode("iso-8859-15")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+index 06bb8d99f5..05089dc982 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/mako/mako/compat.py
+@@ -115,7 +115,7 @@ if py3k:
+             return module
+
+ else:
+-    import imp
++    import importlib
+
+     def load_module(module_id, path):
+         fp = open(path, "rb")
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+index a7dc683365..68b6804c78 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/converters/call_trees_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for call_trees module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.converters import call_trees
+ from tensorflow.python.autograph.converters import functions
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+index 81a7fde808..1370f900fd 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for converter module."""
+
+-import imp
++import importlib
+
+ from tensorflow.python.autograph.core import converter
+ from tensorflow.python.autograph.core import converter_testing
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+index b93cbb627b..452ec71f5b 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/core/converter_testing.py
+@@ -15,7 +15,7 @@
+ """Base class for tests in this module."""
+
+ import contextlib
+-import imp
++import importlib
+ import inspect
+ import sys
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+index 9a62d7c0d2..7ec4fa6dca 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/api_test.py
+@@ -19,7 +19,7 @@ import collections
+ import contextlib
+ import functools
+ import gc
+-import imp
++import importlib
+ import inspect
+ import os
+ import re
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+index 852af3efe7..6456c50446 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/impl/conversion_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for conversion module."""
+
+-import imp
++import importlib
+ import sys
+ import types
+ import weakref
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+index a50a64534a..ba0f31afa2 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/inspect_utils_test.py
+@@ -17,7 +17,7 @@
+ import abc
+ import collections
+ import functools
+-import imp
++import importlib
+ import textwrap
+
+ import six
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+index 29f38d853a..7ca88fa371 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/autograph/pyct/templates_test.py
+@@ -14,7 +14,7 @@
+ # ==============================================================================
+ """Tests for templates module."""
+
+-import imp
++import importlib
+
+ from absl.testing import parameterized
+ import gast
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+index e46460574b..a40fea6568 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/tflite/src/tensorflow/python/tools/api/generator/create_python_api_test.py
+@@ -14,7 +14,7 @@
+ # =============================================================================
+ """Tests for create_python_api."""
+
+-import imp
++import importlib
+ import sys
+
+ from tensorflow.python.platform import test
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+index 73d1742714..ea77dd7647 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/products.py
+@@ -1,5 +1,5 @@
+ import importlib
+-import imp
++import importlib
+
+ from .browsers import product_list
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+index 6a744472b5..9175cb5d34 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
++++ b/qtwebengine/src/3rdparty/chromium/third_party/wpt_tools/wpt/tools/wptrunner/wptrunner/stability.py
+@@ -1,6 +1,6 @@
+ import copy
+ import functools
+-import imp
++import importlib
+ import io
+ import os
+ from collections import OrderedDict, defaultdict
+diff --git a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+index 6912b6f3c0..7d851f7f76 100755
+--- a/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
++++ b/qtwebengine/src/3rdparty/chromium/tools/sublime/ninja_options_script.py
+@@ -16,7 +16,7 @@
+
+ from __future__ import print_function
+
+-import imp
++import importlib
+ import optparse
+ import os
+ import pipes
+diff --git a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+index 1c2aba80af..55260d697e 100644
+--- a/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
++++ b/qtwebengine/src/3rdparty/chromium/v8/third_party/test262-harness/src/parseTestRecord.py
+@@ -10,7 +10,7 @@ from __future__ import print_function
+
+ import os
+ import re
+-import imp
++import importlib
+
+ from _monkeyYaml import load as yamlLoad
+

extras/packaging/gnu-linux/rules/rpm/patches/0015-remove-deleted-xkb-keys.patch

@@ -0,0 +1,45 @@
+diff --git a/qtbase/src/corelib/global/qnamespace.h b/qtbase/src/corelib/global/qnamespace.h
+index 8a2769a3ed..584d3620c9 100644
+--- a/qtbase/src/corelib/global/qnamespace.h
++++ b/qtbase/src/corelib/global/qnamespace.h
+@@ -832,10 +832,6 @@ namespace Qt {
+         Key_Dead_Small_Schwa    = 0x0100128a,
+         Key_Dead_Capital_Schwa  = 0x0100128b,
+         Key_Dead_Greek          = 0x0100128c,
+-        Key_Dead_Lowline        = 0x01001290,
+-        Key_Dead_Aboveverticalline = 0x01001291,
+-        Key_Dead_Belowverticalline = 0x01001292,
+-        Key_Dead_Longsolidusoverlay = 0x01001293,
+
+         // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
+         Key_Back  = 0x01000061,
+diff --git a/qtbase/src/corelib/global/qnamespace.qdoc b/qtbase/src/corelib/global/qnamespace.qdoc
+index 78c69176d8..1623517b5a 100644
+--- a/qtbase/src/corelib/global/qnamespace.qdoc
++++ b/qtbase/src/corelib/global/qnamespace.qdoc
+@@ -1654,10 +1654,6 @@
+     \value Key_Dead_Small_Schwa
+     \value Key_Dead_Capital_Schwa
+     \value Key_Dead_Greek
+-    \value Key_Dead_Lowline
+-    \value Key_Dead_Aboveverticalline
+-    \value Key_Dead_Belowverticalline
+-    \value Key_Dead_Longsolidusoverlay
+     \value Key_Back
+     \value Key_Forward
+     \value Key_Stop
+diff --git a/qtbase/src/gui/platform/unix/qxkbcommon.cpp b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+index fc014b38e2..af1cbbd42a 100644
+--- a/qtbase/src/gui/platform/unix/qxkbcommon.cpp
++++ b/qtbase/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
+-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+-        Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
+
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.

extras/packaging/gnu-linux/rules/rpm/patches/0016-fix-vaapi.patch

@@ -0,0 +1,29 @@
+ qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+index ec212f5a35..58bf4dce7d 100644
+--- a/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
++++ b/qtmultimedia/src/plugins/multimedia/ffmpeg/qffmpegvaapisymbols.cpp
+@@ -37,7 +37,10 @@ static Libs loadLibs()
+     return {};
+ }
+ 
+-constexpr size_t symbolsCount = 39
++constexpr size_t symbolsCount = 38
++#if VA_CHECK_VERSION(1, 9, 0)
++        + 1
++#endif
+ #ifdef DYNAMIC_RESOLVE_VA_DRM_SYMBOLS
+         + 1
+ #endif
+@@ -79,7 +82,9 @@ DEFINE_FUNC(vaEndPicture, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaCreateBuffer, 7, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaMapBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
+ DEFINE_FUNC(vaUnmapBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
++#if VA_CHECK_VERSION(1, 9, 0)
+ DEFINE_FUNC(vaSyncBuffer, 3, VA_STATUS_ERROR_OPERATION_FAILED);
++#endif
+ DEFINE_FUNC(vaDestroyBuffer, 2, VA_STATUS_ERROR_OPERATION_FAILED);
+ 
+ DEFINE_FUNC(vaCreateSurfaces, 8, VA_STATUS_ERROR_OPERATION_FAILED);

extras/packaging/gnu-linux/scripts/build-package-rpm.sh

@@ -44,9 +44,9 @@ LD_LIBRARY_PATH="${QT_JAMI_PREFIX}/lib:${LD_LIBRARY_PATH}"
 PKG_CONFIG_PATH="${QT_JAMI_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
 CMAKE_PREFIX_PATH="${QT_JAMI_PREFIX}/lib/cmake:${CMAKE_PREFIX_PATH}"
 QT_MAJOR=6
-QT_MINOR=4
+QT_MINOR=5
 QT_PATCH=3
-QT_RELEASE_PATCH=2
+QT_RELEASE_PATCH=0
 
 QT_MAJOR_MINOR=${QT_MAJOR}.${QT_MINOR}
 QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
@@ -54,7 +54,7 @@ QT_MAJOR_MINOR_PATCH=${QT_MAJOR}.${QT_MINOR}.${QT_PATCH}
 QT_TARBALL_URL=https://download.qt.io/archive/qt/$QT_MAJOR_MINOR/\
 $QT_MAJOR_MINOR_PATCH/single/qt-everywhere-src-$QT_MAJOR_MINOR_PATCH.tar.xz
 
-QT_TARBALL_SHA256="29a7eebdbba0ea57978dea6083709c93593a60f0f3133a3de08b9571ee8eaab4"
+QT_TARBALL_SHA256="7cda4d119aad27a3887329cfc285f2aba5da85601212bcb0aea27bd6b7b544cb"
 QT_TARBALL_FILE_NAME=$(basename "$QT_TARBALL_URL")
 CACHED_QT_TARBALL=$TARBALLS/$QT_TARBALL_FILE_NAME
 
@@ -105,18 +105,16 @@ if [ ! -f "${RPM_PATH}" ]; then
         # Cache the built Qt RPM package.
         if [[ "${DISTRIBUTION:0:4}" == "rhel" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el8.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_33" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc33.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_34" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc34.x86_64.rpm "${RPM_PATH}"
-        elif [[ "${DISTRIBUTION}" == "fedora_35" ]]; then
-            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_38" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc38.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "fedora_39" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc39.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "alma_9" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.el9.x86_64.rpm "${RPM_PATH}"
         else
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
         fi

extras/packaging/gnu-linux/scripts/install-cmake.sh

@@ -7,9 +7,9 @@ then
     apt-get remove cmake cmake-data -y
 fi
 
-wget https://github.com/Kitware/CMake/releases/download/v3.19.8/cmake-3.19.8-Linux-x86_64.sh \
+wget https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-linux-x86_64.sh\
       -q -O /tmp/cmake-install.sh
-echo "aa5a0e0dd5594b7fd7c107a001a2bfb5f83d9b5d89cf4acabf423c5d977863ad  /tmp/cmake-install.sh" | sha256sum --check 
+echo "63cb3406f5320edc94504212fe75e8625751ec21e8d5dab76d8ed67ed780066e  /tmp/cmake-install.sh" | sha256sum --check
 chmod u+x /tmp/cmake-install.sh
 /tmp/cmake-install.sh --skip-license --prefix=/usr/local/
 rm /tmp/cmake-install.sh

extras/scripts/build-windows.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-
+# -*- coding: utf-8 -*-
 """
 Build, test, and package the project.
 
@@ -28,7 +28,7 @@ mutually exclusive required arguments:
   -z, --zip         Build portable archive
 
 examples:
-1.  build.py --qt=C:/Qt/6.4.3/msvc2019_64  # Build the app using a specific Qt
+1.  build.py --qt=C:/Qt/6.5.3/msvc2019_64  # Build the app using a specific Qt
 2.  build.py --init pack --msi             # Build the app and an MSI installer
 3.  build.py --init --tests                # Build the app and run tests
     build.py pack --zip --skip-build       # Generate a 7z archive of the app
@@ -65,6 +65,20 @@ this_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root_dir = os.path.abspath(os.path.join(this_dir, os.pardir, os.pardir))
 build_dir = os.path.join(repo_root_dir, "build")
 
+def get_latest_toolset_version():
+    """Get the latest toolset version."""
+    # Get the visual studio version. Use only the major version number.
+    # Then: toolset = 2022 ? "v143" : 2019 ? "v142" : 2017 ? "v141" : "v140"
+    vs_ver = get_vs_prop("installationVersion")
+    if vs_ver is None:
+        return None
+    vs_ver = int(vs_ver.split(".")[0])
+    if vs_ver == 17:
+        return "v143"
+    elif vs_ver == 16:
+        return "v142"
+    else:
+        return "v141"
 
 def find_latest_qt_path():
     """Find the latest Qt installation path."""
@@ -190,40 +204,31 @@ def init_submodules():
     """Initialize any git submodules in the project."""
     print("Initializing submodules...")
 
-    if execute_cmd(["git", "submodule", "update", "--init"], False):
+    # Init the client submodules for Windows other than the daemon.
+    submodules = [
+        "3rdparty/qrencode-win32",
+        "3rdparty/SortFilterProxyModel",
+        "3rdparty/md4c",
+        "3rdparty/tidy-html5",
+    ]
+    if execute_cmd(["git", "submodule", "update", "--init" ] + submodules,
+                   False):
         print("Submodule initialization error.")
-    else:
-        if execute_cmd(["git", "submodule", "update", "--recursive"], False):
-            print("Submodule recursive checkout error.")
-        else:
-            print("Submodule recursive checkout finished.")
+        sys.exit(1)
 
 
 def build_deps():
     """Build the dependencies for the project."""
-    print('Patching and building qrencode')
-    apply_cmd = [
-        'git',
-        'apply',
-        '--reject',
-        '--ignore-whitespace',
-        '--whitespace=fix'
-    ]
+    print('Building qrencode')
     qrencode_dir = os.path.join(repo_root_dir, '3rdparty', 'qrencode-win32')
-    patch_file = os.path.join(repo_root_dir, 'qrencode-win32.patch')
-    apply_cmd.append(patch_file)
-    if execute_cmd(apply_cmd, False, None, qrencode_dir):
-        print("Couldn't patch qrencode-win32.")
-
     vs_env_vars = {}
     vs_env_vars.update(get_vs_env())
-
-    msbuild_args = get_ms_build_args("x64", "Release-Lib")
-
+    toolset = get_latest_toolset_version()
+    print(f'Using toolset {toolset}')
+    msbuild_args = get_ms_build_args("x64", "Release-Lib", toolset)
     proj_path = os.path.join(
-        qrencode_dir, "qrencode-win32", "vc8", "qrcodelib", "qrcodelib.vcxproj"
+        qrencode_dir, "qrencode-win32", "vc15", "qrcodelib", "qrcodelib.vcxproj"
     )
-
     build_project(msbuild_args, proj_path, vs_env_vars)
 
 
@@ -264,17 +269,15 @@ def build(config_str, qt_dir, tests):
 
     # Get the daemon bin/include directories.
     daemon_dir = os.path.join(repo_root_dir, "daemon")
-    daemon_bin_dir = os.path.join(
-        daemon_dir, "build", "x64", "ReleaseLib_win32", "bin")
+    daemon_bin_dir = os.path.join(daemon_dir, "build", "lib")
 
     # We need to update the minimum SDK version to be able to
     # build with system theme support
     cmake_options = [
-        "-DWITH_DAEMON_SUBMODULE=ON",
+        "-DJAMICORE_AS_SUBDIR=ON",
         "-DCMAKE_PREFIX_PATH=" + qt_dir,
         "-DCMAKE_MSVCIDE_RUN_PATH=" + qt_dir + "\\bin",
-        "-DCMAKE_INSTALL_PREFIX=" + daemon_bin_dir,
-        "-DLIBJAMI_INCLUDE_DIR=" + daemon_dir + "\\src\\jami",
+        "-DCMAKE_INSTALL_PREFIX=" + os.getcwd(),
         "-DCMAKE_SYSTEM_VERSION=" + WIN_SDK_VERSION,
         "-DCMAKE_BUILD_TYPE=" + "Release",
         "-DENABLE_TESTS=" + str(tests).lower(),

extras/scripts/install.sh

@@ -43,9 +43,10 @@ proc='1'
 priv_install=true
 enable_libwrap=true
 enable_webengine=true
+asan=
 arch=''
 
-while getopts gsc:dQ:P:p:uWwa: OPT; do
+while getopts gsc:dQ:P:p:uWwa:A OPT; do
   case "$OPT" in
     g)
       global='true'
@@ -77,6 +78,9 @@ while getopts gsc:dQ:P:p:uWwa: OPT; do
     a)
       arch="${OPTARG}"
     ;;
+    A)
+      asan='true'
+    ;;
     \?)
       exit 1
     ;;
@@ -116,7 +120,7 @@ else
     mkdir -p contrib/native
     (
         cd contrib/native
-        ../bootstrap ${prefix:+"--prefix=$prefix"}
+        ../bootstrap ${prefix:+"--prefix=$prefix"} ${asan:+"--enable-asan"}
         make -j"${proc}"
     )
 
@@ -135,6 +139,10 @@ else
       CONFIGURE_FLAGS+=" --enable-debug"
     fi
 
+    if [ "${asan}" = "true" ]; then
+      CONFIGURE_FLAGS+=" --enable-asan"
+    fi
+
     # Build the daemon itself.
     test -f configure || ./autogen.sh
 
@@ -183,6 +191,11 @@ client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
                     -DCMAKE_PREFIX_PATH="${qtpath}"
                     -DENABLE_LIBWRAP="${enable_libwrap}"
                     -DWITH_WEBENGINE="${enable_webengine}")
+
+if [ "${asan}" = "true" ]; then
+    client_cmake_flags+=(-DENABLE_ASAN=true)
+fi
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
     #detect arch for macos
     CMAKE_OSX_ARCHITECTURES="arm64"

qrencode-win32.patch

@@ -1,243 +0,0 @@
-From 261d830b9b4126d76519db0e6b6b51b5a730eb40 Mon Sep 17 00:00:00 2001
-From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
-Date: Tue, 4 Dec 2018 17:42:43 -0500
-Subject: [PATCH] b
-
----
- .../vc8/qrcodelib/qrcodelib.vcxproj           | 129 +++++++++++++++++-
- 1 file changed, 125 insertions(+), 4 deletions(-)
-
-diff --git a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-index aabc6b6..8d8293b 100644
---- a/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-+++ b/qrencode-win32/vc8/qrcodelib/qrcodelib.vcxproj
-@@ -5,45 +5,84 @@
-       <Configuration>Debug-Dll</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug-Dll|x64">
-+      <Configuration>Debug-Dll</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Debug-Lib|Win32">
-       <Configuration>Debug-Lib</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Debug-Lib|x64">
-+      <Configuration>Debug-Lib</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release-Dll|Win32">
-       <Configuration>Release-Dll</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release-Dll|x64">
-+      <Configuration>Release-Dll</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release-Lib|Win32">
-       <Configuration>Release-Lib</Configuration>
-       <Platform>Win32</Platform>
-     </ProjectConfiguration>
-+    <ProjectConfiguration Include="Release-Lib|x64">
-+      <Configuration>Release-Lib</Configuration>
-+      <Platform>x64</Platform>
-+    </ProjectConfiguration>
-   </ItemGroup>
-   <PropertyGroup Label="Globals">
-     <ProjectGuid>{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}</ProjectGuid>
-     <RootNamespace>qrcodelib</RootNamespace>
-     <Keyword>Win32Proj</Keyword>
-+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="Configuration">
-     <ConfigurationType>StaticLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="Configuration">
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+    <WholeProgramOptimization>true</WholeProgramOptimization>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-     <WholeProgramOptimization>true</WholeProgramOptimization>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="Configuration">
-     <ConfigurationType>DynamicLibrary</ConfigurationType>
--    <PlatformToolset>v110_xp</PlatformToolset>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-+    <CharacterSet>MultiByte</CharacterSet>
-+  </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="Configuration">
-+    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-     <CharacterSet>MultiByte</CharacterSet>
-   </PropertyGroup>
-   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -52,15 +91,27 @@
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|Win32'" Label="PropertySheets">
-     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-   </ImportGroup>
-+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'" Label="PropertySheets">
-+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-+  </ImportGroup>
-   <PropertyGroup Label="UserMacros" />
-   <PropertyGroup>
-     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
-@@ -70,11 +121,17 @@
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-     <LinkIncremental>true</LinkIncremental>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
-+    <LinkIncremental>true</LinkIncremental>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
-     <OutDir>../.build/$(Configuration)\</OutDir>
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-     <LinkIncremental>false</LinkIncremental>
-   </PropertyGroup>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
-+    <LinkIncremental>false</LinkIncremental>
-+  </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
-     <OutDir>../.build/$(Configuration)\</OutDir>
-     <IntDir>../.build/$(ProjectName)/$(Configuration)\</IntDir>
-@@ -104,6 +161,26 @@
-       <TargetMachine>MachineX86</TargetMachine>
-     </Link>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dll|x64'">
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <AdditionalDependencies>libpng15d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Windows</SubSystem>
-+    </Link>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|Win32'">
-     <ClCompile>
-       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@@ -124,6 +201,26 @@
-       <TargetMachine>MachineX86</TargetMachine>
-     </Link>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dll|x64'">
-+    <ClCompile>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+    <Link>
-+      <AdditionalDependencies>libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalLibraryDirectories>..\qrcode\png;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-+      <ModuleDefinitionFile>qrcodelib.def</ModuleDefinitionFile>
-+      <GenerateDebugInformation>true</GenerateDebugInformation>
-+      <SubSystem>Windows</SubSystem>
-+      <OptimizeReferences>true</OptimizeReferences>
-+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+    </Link>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|Win32'">
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-@@ -137,6 +234,19 @@
-       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-     </ClCompile>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Lib|x64'">
-+    <ClCompile>
-+      <Optimization>Disabled</Optimization>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+  </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|Win32'">
-     <ClCompile>
-       <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-@@ -147,6 +257,17 @@
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-     </ClCompile>
-   </ItemDefinitionGroup>
-+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Lib|x64'">
-+    <ClCompile>
-+      <AdditionalIncludeDirectories>.\;..\qrcode;..\qrcode\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;QRCODELIB_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-+      <PrecompiledHeader>
-+      </PrecompiledHeader>
-+      <WarningLevel>Level3</WarningLevel>
-+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-+    </ClCompile>
-+  </ItemDefinitionGroup>
-   <ItemGroup>
-     <ClCompile Include="qrcodelib.cpp" />
-     <ClCompile Include="..\..\bitstream.c" />
--- 
-2.19.0.windows.1
-

resources/Info.plist

@@ -36,5 +36,7 @@
 	<string>Jami requires to access your microphone to make calls and record audio</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
+    <key>NSAppleEventsUsageDescription</key>
+    <string>Jami requires to monitor global key events for push-to-talk functionality.</string>
 </dict>
 </plist>

resources/icons/Connected_Black_24dp.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<path id="noun-connection-5025318" d="M18,6.3c1.2,0,2.2-1,2.2-2.1C20.1,3,19.2,2,18,2c-1.2,0-2.2,1-2.2,2.1c0,0.5,0.2,1.1,0.6,1.5
+	l-3.3,3.8c-0.8-0.6-2-0.5-2.7,0.2L7.3,7.1c0.5-0.8,0.2-1.9-0.6-2.4C5.9,4.2,4.8,4.5,4.3,5.3C3.8,6.1,4,7.2,4.9,7.7
+	C5.6,8.1,6.4,8,7,7.5l3.1,2.5c-0.5,0.8-0.4,1.9,0.3,2.6l-2.9,2.9c-1.1-0.7-2.5-0.4-3.2,0.7c-0.7,1.1-0.4,2.5,0.7,3.2
+	c1.1,0.7,2.5,0.4,3.2-0.7c0.6-0.9,0.5-2.1-0.3-2.9l2.9-2.9c0.3,0.2,0.7,0.3,1.2,0.3c0,0,0.1,0,0.1,0l0.8,4.8
+	c-1.1,0.3-1.7,1.4-1.4,2.5c0.3,1.1,1.4,1.7,2.5,1.4c1.1-0.3,1.7-1.4,1.4-2.5c-0.3-0.9-1-1.4-1.9-1.4c0,0-0.1,0-0.1,0l-0.8-4.8
+	c0.4-0.1,0.7-0.3,0.9-0.6l3.6,2.7c-0.4,0.8-0.2,1.8,0.6,2.2c0.8,0.4,1.8,0.2,2.2-0.6c0.4-0.8,0.2-1.8-0.6-2.2
+	c-0.6-0.4-1.4-0.3-1.9,0.2l-3.6-2.7c0.2-0.3,0.3-0.7,0.3-1.1c0-0.5-0.2-1.1-0.6-1.5l3.3-3.8C17.1,6.2,17.5,6.3,18,6.3L18,6.3z"/>
+</svg>

resources/icons/Connecting_Black_24dp.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<g id="noun-waiting-3611673" transform="translate(-13.64 -30.48)">
+	<path id="Path_278" d="M25.9,34.5c0.5,0,0.8-0.4,0.8-0.8c0-0.5-0.4-0.8-0.8-0.8c-0.5,0-0.8,0.4-0.8,0.8c0,0.2,0.1,0.4,0.2,0.6
+		C25.4,34.4,25.6,34.5,25.9,34.5z"/>
+	<path id="Path_279" d="M32.7,36.9c0.4-0.4,0.4-1.1,0-1.5c-0.4-0.4-1.1-0.4-1.5,0c-0.4,0.4-0.4,1.1,0,1.5c0.2,0.2,0.5,0.3,0.8,0.3
+		C32.2,37.2,32.5,37.1,32.7,36.9z"/>
+	<path id="Path_280" d="M34.5,41c-0.7,0-1.2,0.5-1.2,1.2s0.5,1.2,1.2,1.2c0.7,0,1.2-0.5,1.2-1.2c0-0.3-0.1-0.6-0.3-0.8
+		C35.1,41.1,34.8,41,34.5,41z"/>
+	<path id="Path_281" d="M31.9,47c-0.7,0-1.3,0.6-1.3,1.3c0,0.7,0.6,1.3,1.3,1.3c0.7,0,1.3-0.6,1.3-1.3c0-0.3-0.1-0.7-0.4-0.9
+		C32.6,47.1,32.3,47,31.9,47z"/>
+	<path id="Path_282" d="M25.9,49.4c-0.8,0-1.4,0.6-1.4,1.4c0,0.8,0.6,1.4,1.4,1.4c0.8,0,1.4-0.6,1.4-1.4c0-0.4-0.1-0.7-0.4-1
+		C26.6,49.5,26.2,49.4,25.9,49.4z"/>
+	<path id="Path_283" d="M18.7,47.2L18.7,47.2c-0.6,0.6-0.6,1.6,0,2.2c0.6,0.6,1.6,0.6,2.2,0c0.6-0.6,0.6-1.6,0-2.2
+		c-0.3-0.3-0.7-0.5-1.1-0.5C19.4,46.7,19,46.9,18.7,47.2z"/>
+	<path id="Path_284" d="M18.9,42.2c0-0.9-0.7-1.7-1.6-1.7s-1.7,0.7-1.7,1.6c0,0.9,0.7,1.7,1.6,1.7c0.4,0,0.9-0.2,1.2-0.5
+		C18.8,43,18.9,42.6,18.9,42.2z"/>
+	<path id="Path_285" d="M21.1,34.9c-0.7-0.3-1.5-0.1-1.9,0.6c-0.3,0.7-0.1,1.5,0.6,1.9c0.7,0.3,1.5,0.1,1.9-0.6
+		c0.1-0.2,0.2-0.5,0.1-0.7C21.8,35.5,21.5,35.1,21.1,34.9z"/>
+</g>
+</svg>

resources/icons/Icon_Donate.svg

@@ -1,15 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="43" height="52.655" viewBox="0 0 43 52.655">
-  <defs>
-    <clipPath id="clip-path">
-      <rect id="Rectangle_268" data-name="Rectangle 268" width="38" height="24" transform="translate(-0.407 0.083)" fill="#fff" stroke="#707070" stroke-width="1"/>
-    </clipPath>
-  </defs>
-  <g id="Icon_Donate" transform="translate(-22 -189.345)">
-    <rect id="Rectangle_267" data-name="Rectangle 267" width="43" height="10" rx="5" transform="translate(22 232)" fill="#9eb3c3"/>
-    <path id="Path_459" data-name="Path 459" d="M9.674,17.083,8.562,16.07C4.609,12.486,2,10.122,2,7.221A4.18,4.18,0,0,1,6.221,3,4.6,4.6,0,0,1,9.674,4.6,4.6,4.6,0,0,1,13.128,3a4.18,4.18,0,0,1,4.221,4.221c0,2.9-2.609,5.265-6.562,8.856Z" transform="translate(22.407 199.828)" fill="#ff0045" opacity="0.3"/>
-    <path id="Path_460" data-name="Path 460" d="M6.953,12.088l-.718-.654C3.684,9.122,2,7.6,2,5.724A2.7,2.7,0,0,1,4.724,3,2.966,2.966,0,0,1,6.953,4.035,2.966,2.966,0,0,1,9.182,3a2.7,2.7,0,0,1,2.724,2.724c0,1.872-1.684,3.4-4.235,5.716Z" transform="translate(45.571 186.345)" fill="#ff0045" opacity="0.16"/>
-    <g id="Mask_Group_38" data-name="Mask Group 38" transform="translate(24.407 213.918)" clip-path="url(#clip-path)">
-      <path id="Path_270" data-name="Path 270" d="M12.649,22.542l-1.544-1.406C5.621,16.163,2,12.883,2,8.857A5.8,5.8,0,0,1,7.857,3a6.377,6.377,0,0,1,4.792,2.226A6.377,6.377,0,0,1,17.442,3,5.8,5.8,0,0,1,23.3,8.857c0,4.025-3.621,7.306-9.105,12.289Z" transform="translate(5.992 5.54)" fill="#ff0045"/>
-    </g>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 43 52.7" style="enable-background:new 0 0 43 52.7;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#9EB3C3;}
+	.st1{opacity:0.3;fill:#FF0045;enable-background:new    ;}
+	.st2{opacity:0.16;fill:#FF0045;enable-background:new    ;}
+	.st3{fill:#FF0045;}
+</style>
+<g id="Icon_Donate" transform="translate(-22 -189.345)">
+	<path id="Rectangle_267" class="st0" d="M27,232h33c2.8,0,5,2.2,5,5l0,0c0,2.8-2.2,5-5,5H27c-2.8,0-5-2.2-5-5l0,0
+		C22,234.2,24.2,232,27,232z"/>
+	<path id="Path_459" class="st1" d="M32.1,216.9l-1.1-1c-4-3.6-6.6-5.9-6.6-8.8c0-2.3,1.8-4.2,4.1-4.2c0,0,0.1,0,0.1,0
+		c1.3,0,2.6,0.6,3.5,1.6c0.9-1,2.1-1.6,3.5-1.6c2.3,0,4.2,1.8,4.2,4.1c0,0,0,0.1,0,0.1c0,2.9-2.6,5.3-6.6,8.9L32.1,216.9z"/>
+	<path id="Path_460" class="st2" d="M52.5,198.4l-0.7-0.7c-2.6-2.3-4.2-3.8-4.2-5.7c0-1.5,1.2-2.7,2.7-2.7c0,0,0,0,0,0
+		c0.9,0,1.7,0.4,2.2,1c0.6-0.7,1.4-1,2.2-1c1.5,0,2.7,1.2,2.7,2.7c0,0,0,0,0,0c0,1.9-1.7,3.4-4.2,5.7L52.5,198.4z"/>
+	<path class="st3" d="M37.3,236.7h11.4c3.1-3,4.9-5.5,4.9-8.4c0,0,0-0.1,0-0.1c0-3.2-2.7-5.8-5.9-5.7c-1.8,0-3.6,0.8-4.8,2.2
+		c-1.2-1.4-2.9-2.2-4.8-2.2c0,0-0.1,0-0.1,0c-3.2,0-5.8,2.7-5.7,5.9C32.4,231.2,34.3,233.7,37.3,236.7z"/>
+</g>
 </svg>

resources/icons/add_a_photo_black_24dp.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="add_a_photo_black_24dp" opacity="1">
+    <path id="Path_248" data-name="Path 248" d="M0,0H24V24H0Z" fill="none"/>
+    <path id="Path_249" data-name="Path 249" d="M21,6H17.83L16,4H10V6h5.12l1.83,2H21V20H5V11H3v9a2.006,2.006,0,0,0,2,2H21a2.006,2.006,0,0,0,2-2V8A2.006,2.006,0,0,0,21,6ZM8,14a5,5,0,1,0,5-5A5,5,0,0,0,8,14Zm5-3a3,3,0,1,1-3,3A3.009,3.009,0,0,1,13,11ZM5,6H8V4H5V1H3V4H0V6H3V9H5Z" fill="black"/>
+  </g>
+</svg>

resources/icons/add_photo_alternate_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="add_photo_alternate_black_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_250" data-name="Path 250" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_251" data-name="Path 251" d="M18,20H4V6h9V4H4A2.006,2.006,0,0,0,2,6V20a2.006,2.006,0,0,0,2,2H18a2.006,2.006,0,0,0,2-2V11H18Zm-7.79-3.17L8.25,14.47,5.5,18h11l-3.54-4.71ZM20,4V1H18V4H15c.01.01,0,2,0,2h3V8.99c.01.01,2,0,2,0V6h3V4Z" fill="#fff"/>
+</svg>

resources/icons/assignment_ind_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="assignment_ind_black_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_311" data-name="Path 311" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_312" data-name="Path 312" d="M19,3H14.82A2.988,2.988,0,0,0,9.18,3H5A2.006,2.006,0,0,0,3,5V19a2.006,2.006,0,0,0,2,2H19a2.006,2.006,0,0,0,2-2V5A2.006,2.006,0,0,0,19,3Zm-7-.25a.767.767,0,1,1-.55.25A.749.749,0,0,1,12,2.75ZM19,19H5V5H19ZM12,6a3,3,0,1,0,3,3A3.009,3.009,0,0,0,12,6Zm0,4a1,1,0,1,1,1-1A1,1,0,0,1,12,10ZM6,16.47V18H18V16.47c0-2.5-3.97-3.58-6-3.58S6,13.96,6,16.47ZM8.31,16A7.011,7.011,0,0,1,12,14.88,6.982,6.982,0,0,1,15.69,16Z" fill="#005699"/>
+</svg>

resources/icons/brush_black_24dp.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="brush_black_24dp" opacity="1">
+    <path id="Path_323" data-name="Path 323" d="M0,0H24V24H0Z" fill="none"/>
+    <path id="Path_324" data-name="Path 324" d="M7,16a1,1,0,0,1,1,1,2.006,2.006,0,0,1-2,2,2.825,2.825,0,0,1-.5-.05A3.947,3.947,0,0,0,6,17a1,1,0,0,1,1-1M18.67,3a1.024,1.024,0,0,0-.71.29L9,12.25,11.75,15l8.96-8.96a1,1,0,0,0,0-1.41L19.37,3.29a.976.976,0,0,0-.7-.29ZM7,14a3,3,0,0,0-3,3,2.029,2.029,0,0,1-2,2,5.174,5.174,0,0,0,4,2,4,4,0,0,0,4-4A3,3,0,0,0,7,14Z"/>
+  </g>
+</svg>

resources/icons/check_circle_24dp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+  <path id="check_circle_FILL0_wght400_GRAD0_opsz24" d="M88.6-865.4l7.05-7.05-1.4-1.4L88.6-868.2l-2.85-2.85-1.4,1.4ZM90-860a9.738,9.738,0,0,1-3.9-.787,10.1,10.1,0,0,1-3.175-2.138,10.1,10.1,0,0,1-2.138-3.175A9.738,9.738,0,0,1,80-870a9.738,9.738,0,0,1,.787-3.9,10.1,10.1,0,0,1,2.138-3.175,10.1,10.1,0,0,1,3.175-2.138A9.738,9.738,0,0,1,90-880a9.738,9.738,0,0,1,3.9.787,10.1,10.1,0,0,1,3.175,2.138,10.1,10.1,0,0,1,2.138,3.175A9.738,9.738,0,0,1,100-870a9.738,9.738,0,0,1-.787,3.9,10.1,10.1,0,0,1-2.138,3.175,10.1,10.1,0,0,1-3.175,2.138A9.738,9.738,0,0,1,90-860Zm0-2a7.721,7.721,0,0,0,5.675-2.325A7.721,7.721,0,0,0,98-870a7.721,7.721,0,0,0-2.325-5.675A7.721,7.721,0,0,0,90-878a7.721,7.721,0,0,0-5.675,2.325A7.721,7.721,0,0,0,82-870a7.721,7.721,0,0,0,2.325,5.675A7.721,7.721,0,0,0,90-862ZM90-870Z" transform="translate(-80 880)" fill="#fff"/>
+</svg>

resources/icons/content_copy_24dp.svg

@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M20.4,2.2H8.5c-0.9,0-1.6,0.7-1.6,1.6v2.9H3.6C2.7,6.7,2,7.4,2,8.3v11.9c0,0.9,0.7,1.6,1.6,1.6h11.9c0.9,0,1.6-0.7,1.6-1.6
-	v-2.9h3.3c0.9,0,1.6-0.7,1.6-1.6V3.8C22,2.9,21.3,2.2,20.4,2.2z M15.8,20.2c0,0.2-0.1,0.3-0.3,0.3H3.6c-0.2,0-0.3-0.1-0.3-0.3V8.3
-	C3.3,8.2,3.4,8,3.6,8h11.9c0.2,0,0.3,0.1,0.3,0.3V20.2z M20.7,15.7c0,0.2-0.1,0.3-0.3,0.3h-3.3V8.3c0-0.9-0.7-1.6-1.6-1.6H8.2V3.8
-	c0-0.2,0.1-0.3,0.3-0.3h11.9c0.2,0,0.3,0.1,0.3,0.3V15.7z"/>
-</svg>
+<svg id="content_copy_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_305" data-name="Path 305" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_306" data-name="Path 306" d="M16,1H4A2.006,2.006,0,0,0,2,3V17H4V3H16Zm3,4H8A2.006,2.006,0,0,0,6,7V21a2.006,2.006,0,0,0,2,2H19a2.006,2.006,0,0,0,2-2V7A2.006,2.006,0,0,0,19,5Zm0,16H8V7H19Z" fill="#005699"/>
+</svg>

resources/icons/favorite_black_24dp.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="21.5" height="20.112" viewBox="0 0 21.5 20.112">
+  <g id="favorite_black_24dp" transform="translate(-1.25 -2.25)">
+    <path id="Path_270" data-name="Path 270" d="M12,21.35l-1.45-1.32C5.4,15.36,2,12.28,2,8.5A5.447,5.447,0,0,1,7.5,3,5.988,5.988,0,0,1,12,5.09,5.988,5.988,0,0,1,16.5,3,5.447,5.447,0,0,1,22,8.5c0,3.78-3.4,6.86-8.55,11.54Z" fill="none" stroke="#03b9e9" stroke-width="1.5"/>
+  </g>
+</svg>

resources/icons/fiber_manual_record_24dp.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M24 24H0V0h24v24z"/><circle fill="#ff0000" cx="12" cy="12" r="8"/></svg>

resources/icons/manage_accounts_24dp.svg

@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="manage_accounts_black_24dp" opacity="1">
+    <g id="Group_82" data-name="Group 82">
+      <path id="Path_314" data-name="Path 314" d="M0,0H24V24H0Z" fill="none"/>
+    </g>
+    <g id="Group_84" data-name="Group 84">
+      <g id="Group_83" data-name="Group 83">
+        <path id="Path_315" data-name="Path 315" d="M4,18v-.65a.946.946,0,0,1,.41-.81A10.889,10.889,0,0,1,10,15a.22.22,0,0,1,.08.01,6.886,6.886,0,0,1,.59-1.98c-.22-.02-.44-.03-.67-.03a12.876,12.876,0,0,0-6.61,1.82A2.922,2.922,0,0,0,2,17.35V20h9.26a7.133,7.133,0,0,1-.97-2Z" fill="black"/>
+        <path id="Path_316" data-name="Path 316" d="M10,12A4,4,0,1,0,6,8,4,4,0,0,0,10,12Zm0-6A2,2,0,1,1,8,8,2.006,2.006,0,0,1,10,6Z" fill="black"/>
+        <path id="Path_317" data-name="Path 317" d="M20.75,16a4.338,4.338,0,0,0-.06-.63l1.14-1.01-1-1.73-1.45.49a3.647,3.647,0,0,0-1.08-.63L18,11H16l-.3,1.49a3.647,3.647,0,0,0-1.08.63l-1.45-.49-1,1.73,1.14,1.01a4.338,4.338,0,0,0-.06.63,4.338,4.338,0,0,0,.06.63l-1.14,1.01,1,1.73,1.45-.49a3.647,3.647,0,0,0,1.08.63L16,21h2l.3-1.49a3.647,3.647,0,0,0,1.08-.63l1.45.49,1-1.73-1.14-1.01A4.338,4.338,0,0,0,20.75,16ZM17,18a2,2,0,1,1,2-2A2.006,2.006,0,0,1,17,18Z" fill="black"/>
+      </g>
+    </g>
+  </g>
+</svg>

resources/icons/notification_important_24dp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="21.5" viewBox="0 0 18 21.5">
+  <path id="notification_important_black_24dp" d="M10.01,21.01a1.99,1.99,0,0,0,3.98,0ZM12,6a5,5,0,0,1,5,5v7H7V11A5,5,0,0,1,12,6Zm0-4.5A1.5,1.5,0,0,0,10.5,3V4.17A6.993,6.993,0,0,0,5,11v6L3,19v1H21V19l-2-2V11a6.993,6.993,0,0,0-5.5-6.83V3A1.5,1.5,0,0,0,12,1.5ZM11,8h2v4H11Zm0,6h2v2H11Z" transform="translate(-3 -1.5)" fill="#c02"/>
+</svg>

resources/icons/person_add_24dp.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="person_add_alt_black_24dp" opacity="1">
+    <g id="Group_80" data-name="Group 80">
+      <rect id="Rectangle_324" data-name="Rectangle 324" width="24" height="24" fill="none"/>
+    </g>
+    <g id="Group_81" data-name="Group 81">
+      <path id="Path_313" data-name="Path 313" d="M20,9V6H18V9H15v2h3v3h2V11h3V9ZM9,12A4,4,0,1,0,5,8,4,4,0,0,0,9,12ZM9,6A2,2,0,1,1,7,8,2.006,2.006,0,0,1,9,6Zm6.39,8.56a13.867,13.867,0,0,0-12.78,0A2.971,2.971,0,0,0,1,17.22V20H17V17.22A2.971,2.971,0,0,0,15.39,14.56ZM15,18H3v-.78a.971.971,0,0,1,.52-.88A12.108,12.108,0,0,1,9,15a12.108,12.108,0,0,1,5.48,1.34.971.971,0,0,1,.52.88Z" fill="black"/>
+    </g>
+  </g>
+</svg>

resources/icons/person_outline_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="person_outline_black_24dp_1_" data-name="person_outline_black_24dp (1)" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_325" data-name="Path 325" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_326" data-name="Path 326" d="M12,5.9A2.1,2.1,0,1,1,9.9,8,2.1,2.1,0,0,1,12,5.9m0,9c2.97,0,6.1,1.46,6.1,2.1v1.1H5.9V17c0-.64,3.13-2.1,6.1-2.1M12,4a4,4,0,1,0,4,4A4,4,0,0,0,12,4Zm0,9c-2.67,0-8,1.34-8,4v3H20V17C20,14.34,14.67,13,12,13Z"/>
+</svg>

resources/icons/phone_in_talk_24dp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path id="phone_in_talk_FILL0_wght400_GRAD0_opsz24_1_" data-name="phone_in_talk_FILL0_wght400_GRAD0_opsz24 (1)" d="M134.222-832a6,6,0,0,0-1.811-4.411A6,6,0,0,0,128-838.222V-840a7.737,7.737,0,0,1,3.122.633,8.132,8.132,0,0,1,2.533,1.711,8.133,8.133,0,0,1,1.711,2.533A7.74,7.74,0,0,1,136-832Zm-3.556,0a2.572,2.572,0,0,0-.778-1.889,2.571,2.571,0,0,0-1.889-.778v-1.778a4.283,4.283,0,0,1,3.144,1.3,4.283,4.283,0,0,1,1.3,3.144Zm4.4,8a13.343,13.343,0,0,1-5.489-1.211,16.42,16.42,0,0,1-4.933-3.433,16.42,16.42,0,0,1-3.433-4.933A13.343,13.343,0,0,1,120-839.067a.9.9,0,0,1,.267-.667.9.9,0,0,1,.667-.267h3.6a.827.827,0,0,1,.556.211.812.812,0,0,1,.289.5l.578,3.111a1.567,1.567,0,0,1-.022.6.934.934,0,0,1-.244.422l-2.156,2.178a10.745,10.745,0,0,0,1.056,1.589,15.638,15.638,0,0,0,1.344,1.478,15.651,15.651,0,0,0,1.444,1.278,14.051,14.051,0,0,0,1.6,1.078l2.089-2.089a1.245,1.245,0,0,1,.522-.3,1.431,1.431,0,0,1,.633-.056l3.067.622a1.029,1.029,0,0,1,.511.322.782.782,0,0,1,.2.522v3.6a.9.9,0,0,1-.267.667A.9.9,0,0,1,135.067-824Zm-12.378-10.667,1.467-1.467-.378-2.089H121.8a18.259,18.259,0,0,0,.311,1.8A9.736,9.736,0,0,0,122.689-834.667Zm7.956,7.956a11.029,11.029,0,0,0,1.767.6,10.838,10.838,0,0,0,1.811.289v-1.956l-2.089-.422ZM122.689-834.667ZM130.644-826.711Z" transform="translate(-120 840)"/>
+</svg>

resources/icons/re_record_24dp.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<path d="M20.2,6.5c-1.4-2.2-3.6-3.7-6-4.2C9,1.1,3.9,4.2,2.7,9.3c0,0,0,0,0,0l0,0.1c-0.6,2.4-0.1,4.9,1.2,6.9c1.2,1.9,3,3.3,5.1,4
-	l-0.4,0.3c-0.1,0-0.1,0.1-0.2,0.1C8,20.9,8,21.4,8.2,21.7C8.3,21.9,8.5,22,8.7,22c0,0,0.1,0,0.1,0c0.2,0,0.3-0.1,0.4-0.1l2-1.2
-	c0.2-0.1,0.3-0.3,0.3-0.5s0-0.4-0.1-0.6l-1.3-2c-0.2-0.3-0.6-0.4-1-0.2c-0.4,0.2-0.5,0.7-0.3,1l0.2,0.4c-1.7-0.6-3.1-1.7-4.1-3.3
-	c-1.1-1.7-1.4-3.8-1-5.9c0,0,0,0,0,0l0-0.1c1-4.2,5.3-6.8,9.7-5.9c2.1,0.5,3.9,1.8,5.1,3.6c1.1,1.7,1.4,3.8,1,5.9
-	c-0.6,2.7-2.8,4.9-5.6,5.8c-0.4,0.1-0.6,0.5-0.5,0.9c0.1,0.4,0.5,0.6,0.9,0.5c3.3-1,5.9-3.7,6.7-6.9l0-0.1
-	C21.9,11,21.5,8.5,20.2,6.5z"/>
-</svg>

resources/icons/record_round_black_24dp.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+  <g id="Picture_FILLO" transform="translate(-378.5 -900)">
+    <circle id="Oval" cx="7.222" cy="7.222" r="7.222" transform="translate(381.278 902.778)" fill="#fff"/>
+    <g id="Oval-2" data-name="Oval" transform="translate(378.5 900)" fill="none" stroke="#fff" stroke-width="1">
+      <circle cx="10" cy="10" r="10" stroke="none"/>
+      <circle cx="10" cy="10" r="9.5" fill="none"/>
+    </g>
+  </g>
+</svg>

resources/icons/remove_circle_outline_black_24dp.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="remove_circle_outline_black_24dp" opacity="1">
+    <path id="Path_252" data-name="Path 252" d="M0,0H24V24H0Z" fill="none"/>
+    <path id="Path_253" data-name="Path 253" d="M7,11v2H17V11Zm5-9A10,10,0,1,0,22,12,10,10,0,0,0,12,2Zm0,18a8,8,0,1,1,8-8A8.011,8.011,0,0,1,12,20Z" fill="black"/>
+  </g>
+</svg>

resources/icons/reply.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M39 38v-8.7q0-2.7-1.9-4.6-1.9-1.9-4.6-1.9H11.7l7.7 7.7-2.1 2.1L6 21.3 17.3 10l2.1 2.1-7.7 7.7h20.8q3.9 0 6.7 2.775Q42 25.35 42 29.3V38Z"/></svg>

resources/icons/reply_black_24dp.svg

@@ -0,0 +1,4 @@
+<svg id="reply_black_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path id="Path_333" data-name="Path 333" d="M0,0H24V24H0Z" fill="none"/>
+  <path id="Path_334" data-name="Path 334" d="M10,9V5L3,12l7,7V14.9c5,0,8.5,1.6,11,5.1C20,15,17,10,10,9Z" fill="none" stroke="#000" stroke-linecap="round" stroke-width="1.5"/>
+</svg>

resources/icons/restart_black_24dp.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+  <path id="refresh_FILL0_wght400_GRAD0_opsz24" d="M170-780a9.651,9.651,0,0,0,7.094-2.906A9.651,9.651,0,0,0,180-790a9.651,9.651,0,0,0-2.906-7.094A9.651,9.651,0,0,0,170-800a9.9,9.9,0,0,0-4.125.891,9.528,9.528,0,0,0-3.375,2.547V-800H160v8.75h8.75v-2.5H163.5a7.3,7.3,0,0,1,2.734-2.75,7.409,7.409,0,0,1,3.766-1,7.233,7.233,0,0,1,5.313,2.188A7.233,7.233,0,0,1,177.5-790a7.233,7.233,0,0,1-2.187,5.313A7.233,7.233,0,0,1,170-782.5a7.328,7.328,0,0,1-4.344-1.375,7.261,7.261,0,0,1-2.719-3.625h-2.625a9.87,9.87,0,0,0,3.563,5.406A9.7,9.7,0,0,0,170-780Z" transform="translate(-160 800)" fill="#fff"/>
+</svg>

resources/icons/settings_24dp.svg

@@ -1,13 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Settings</title>
-    <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Settings" fill="#000000" fill-rule="nonzero">
-            <g id="Shape" transform="translate(2.000000, 2.000000)">
-                <path d="M0.833333333,4.16666667 L3.45208333,4.16666667 C3.82561804,5.63721759 5.14941646,6.66679689 6.66666667,6.66679689 C8.18391688,6.66679689 9.5077153,5.63721759 9.88125,4.16666667 L19.1666667,4.16666667 C19.626904,4.16666667 20,3.79357062 20,3.33333333 C20,2.87309604 19.626904,2.5 19.1666667,2.5 L9.88125,2.5 C9.5077153,1.02944908 8.18391688,-0.000130218715 6.66666667,-0.000130218715 C5.14941646,-0.000130218715 3.82561804,1.02944908 3.45208333,2.5 L0.833333333,2.5 C0.373096042,2.5 0,2.87309604 0,3.33333333 C0,3.79357062 0.373096042,4.16666667 0.833333333,4.16666667 L0.833333333,4.16666667 Z M6.66666667,1.66666667 C7.58714125,1.66666667 8.33333333,2.41285875 8.33333333,3.33333333 C8.33333333,4.25380792 7.58714125,5 6.66666667,5 C5.74619208,5 5,4.25380792 5,3.33333333 C5,2.41285875 5.74619208,1.66666667 6.66666667,1.66666667 Z"></path>
-                <path d="M0.833333333,10.8333333 L10.11875,10.8333333 C10.4922847,12.3038843 11.8160831,13.3334636 13.3333333,13.3334636 C14.8505835,13.3334636 16.174382,12.3038843 16.5479167,10.8333333 L19.1666667,10.8333333 C19.626904,10.8333333 20,10.4602373 20,10 C20,9.53976271 19.626904,9.16666667 19.1666667,9.16666667 L16.5479167,9.16666667 C16.174382,7.69611574 14.8505835,6.66653645 13.3333333,6.66653645 C11.8160831,6.66653645 10.4922847,7.69611574 10.11875,9.16666667 L0.833333333,9.16666667 C0.373096042,9.16666667 0,9.53976271 0,10 C0,10.4602373 0.373096042,10.8333333 0.833333333,10.8333333 L0.833333333,10.8333333 Z M13.3333333,8.33333333 C14.2538079,8.33333333 15,9.07952542 15,10 C15,10.9204746 14.2538079,11.6666667 13.3333333,11.6666667 C12.4128588,11.6666667 11.6666667,10.9204746 11.6666667,10 C11.6666667,9.07952542 12.4128588,8.33333333 13.3333333,8.33333333 Z"></path>
-                <path d="M0.833333333,17.5 L3.45208333,17.5 C3.82561804,18.9705509 5.14941646,20.0001302 6.66666667,20.0001302 C8.18391688,20.0001302 9.5077153,18.9705509 9.88125,17.5 L19.1666667,17.5 C19.626904,17.5 20,17.126904 20,16.6666667 C20,16.2064294 19.626904,15.8333333 19.1666667,15.8333333 L9.88125,15.8333333 C9.5077153,14.3627824 8.18391688,13.3332031 6.66666667,13.3332031 C5.14941646,13.3332031 3.82561804,14.3627824 3.45208333,15.8333333 L0.833333333,15.8333333 C0.373096042,15.8333333 0,16.2064294 0,16.6666667 C0,17.126904 0.373096042,17.5 0.833333333,17.5 Z M6.66666667,15 C7.58714125,15 8.33333333,15.7461921 8.33333333,16.6666667 C8.33333333,17.5871412 7.58714125,18.3333333 6.66666667,18.3333333 C5.74619208,18.3333333 5,17.5871412 5,16.6666667 C5,15.7461921 5.74619208,15 6.66666667,15 Z"></path>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="19.901" viewBox="0 0 20 19.901">
+  <path id="settings_FILL0_wght400_GRAD0_opsz24_1_" data-name="settings_FILL0_wght400_GRAD0_opsz24 (1)" d="M85.264-860.1l-.4-3.184a3.774,3.774,0,0,1-.609-.3q-.286-.174-.56-.373l-2.96,1.244L78-867.438l2.562-1.94a2.375,2.375,0,0,1-.025-.336v-.672a2.375,2.375,0,0,1,.025-.336L78-872.662l2.736-4.726,2.96,1.244a6.791,6.791,0,0,1,.572-.373,5.014,5.014,0,0,1,.6-.3l.4-3.184h5.473l.4,3.184a3.779,3.779,0,0,1,.609.3q.286.174.56.373l2.96-1.244L98-872.662l-2.562,1.94a2.375,2.375,0,0,1,.025.336v.672a1.221,1.221,0,0,1-.05.336l2.562,1.94-2.736,4.726L92.3-863.955a6.776,6.776,0,0,1-.572.373,5.005,5.005,0,0,1-.6.3l-.4,3.184ZM87-862.09H88.97l.348-2.637a5.577,5.577,0,0,0,1.43-.585,5.946,5.946,0,0,0,1.206-.933l2.463,1.02.97-1.692-2.139-1.617a3.51,3.51,0,0,0,.174-.734,6.116,6.116,0,0,0,.05-.784,6.116,6.116,0,0,0-.05-.784,3.511,3.511,0,0,0-.174-.734l2.139-1.617-.97-1.692-2.463,1.045a5.524,5.524,0,0,0-1.206-.958,5.575,5.575,0,0,0-1.43-.585L89-878.01H87.03l-.348,2.637a5.575,5.575,0,0,0-1.43.585,5.946,5.946,0,0,0-1.206.933l-2.463-1.02-.97,1.692,2.139,1.592a4.05,4.05,0,0,0-.174.746,6.031,6.031,0,0,0-.05.8,5.833,5.833,0,0,0,.05.771,4.048,4.048,0,0,0,.174.746l-2.139,1.617.97,1.692,2.463-1.045a5.527,5.527,0,0,0,1.206.958,5.577,5.577,0,0,0,1.43.585Z" transform="translate(-78 880)"/>
+</svg>

resources/icons/share_24dp.svg

@@ -1,11 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Share</title>
-    <g id="Icones" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Share" fill="#000000" stroke="#000000" stroke-width="0.75">
-            <g id="SHARE" transform="translate(4.000000, 2.000000)">
-                <path d="M13.5,15.00005 C14.6105,15.00005 15.5,15.88955 15.5,17.00005 C15.5,18.1103 14.6105,19.00005 13.5,19.00005 C12.3895,19.00005 11.5,18.1103 11.5,17.00005 C11.5,15.88955 12.3895,15.00005 13.5,15.00005 M3,8.00005 C4.1105,8.00005 5,8.88955 5,10.00005 C5,11.11055 4.1105,12.00005 3,12.00005 C1.8895,12.00005 1,11.11055 1,10.00005 C1,8.88955 1.8895,8.00005 3,8.00005 M13.5,1.00005 C14.6105,1.00005 15.5,1.88955 15.5,3.00005 C15.5,4.11055 14.6105,5.00005 13.5,5.00005 C12.3895,5.00005 11.5,4.11055 11.5,3.00005 C11.5,1.88955 12.3895,1.00005 13.5,1.00005 M13.5,5e-05 C11.849,5e-05 10.5,1.34905 10.5,3.00005 C10.5,3.47555 10.6135,3.92755 10.8125,4.32805 L5.086,7.85155 C4.545,7.3263 3.8095,7.00005 3,7.00005 C1.349,7.00005 0,8.34905 0,10.00005 C0,11.65105 1.349,13.00005 3,13.00005 C3.81525,13.00005 4.552,12.67255 5.09375,12.14055 L10.82025,15.66405 C10.6165,16.0683 10.5,16.51805 10.5,17.00005 C10.5,18.65105 11.849,20.00005 13.5,20.00005 C15.151,20.00005 16.5,18.65105 16.5,17.00005 C16.5,15.34905 15.151,14.00005 13.5,14.00005 C12.6905,14.00005 11.955,14.3263 11.414,14.85155 L5.6875,11.32805 C5.8865,10.92755 6,10.47555 6,10.00005 C6,9.51805 5.8835,9.06855 5.67975,8.66405 L11.40625,5.14055 C11.94825,5.67255 12.68475,6.00005 13.5,6.00005 C15.151,6.00005 16.5,4.65105 16.5,3.00005 C16.5,1.34905 15.151,5e-05 13.5,5e-05" id="Fill-1"></path>
-            </g>
-        </g>
+<svg id="share_24dp" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g id="Group_66" data-name="Group 66">
+    <rect id="Rectangle_305" data-name="Rectangle 305" width="24" height="24" fill="none"/>
+  </g>
+  <g id="Group_68" data-name="Group 68">
+    <g id="Group_67" data-name="Group 67">
+      <path id="Path_302" data-name="Path 302" d="M3,11h8V3H3ZM5,5H9V9H5Z" fill="#005699"/>
+      <path id="Path_303" data-name="Path 303" d="M3,21h8V13H3Zm2-6H9v4H5Z" fill="#005699"/>
+      <path id="Path_304" data-name="Path 304" d="M13,3v8h8V3Zm6,6H15V5h4Z" fill="#005699"/>
+      <rect id="Rectangle_306" data-name="Rectangle 306" width="2" height="2" transform="translate(19 19)" fill="#005699"/>
+      <rect id="Rectangle_307" data-name="Rectangle 307" width="2" height="2" transform="translate(13 13)" fill="#005699"/>
+      <rect id="Rectangle_308" data-name="Rectangle 308" width="2" height="2" transform="translate(15 15)" fill="#005699"/>
+      <rect id="Rectangle_309" data-name="Rectangle 309" width="2" height="2" transform="translate(13 17)" fill="#005699"/>
+      <rect id="Rectangle_310" data-name="Rectangle 310" width="2" height="2" transform="translate(15 19)" fill="#005699"/>
+      <rect id="Rectangle_311" data-name="Rectangle 311" width="2" height="2" transform="translate(17 17)" fill="#005699"/>
+      <rect id="Rectangle_312" data-name="Rectangle 312" width="2" height="2" transform="translate(17 13)" fill="#005699"/>
+      <rect id="Rectangle_313" data-name="Rectangle 313" width="2" height="2" transform="translate(19 15)" fill="#005699"/>
     </g>
-</svg>
+  </g>
+</svg>

resources/icons/stop_24dp_red.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none"/><path d="M6 6h12v12H6z" fill="#ff0000"/></svg>

resources/icons/stop_rectangle_24dp.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="16" viewBox="0 0 15 16">
+  <g id="Stop_FILLO" fill="none" stroke="#fff" stroke-width="1.5">
+    <rect width="15" height="16" rx="5" stroke="none"/>
+    <rect x="0.75" y="0.75" width="13.5" height="14.5" rx="4.25" fill="none"/>
+  </g>
+</svg>

resources/misc/projectcredits.html

@@ -1,21 +1,27 @@
-<h3 align="center"><span style="font-weight:600"> CREATED BY:</span></h3>
+<h4 align="left"><span style="font-weight:600"> Created by</span></h4>
 <p>Adrien Béraud<br>
 Albert Babí<br>
 Alexandre Lision<br>
 Alexandr Sergheev<br>
 Alexandre Viau<br>
+Alexander Lussier-Cullen<br>
 Aline Bonnet<br>
 Aline Gondim Santos<br>
+Alireza Toghiani<br>
 Amin Bandali<br>
 AmirHossein Naghshzan<br>
+Amna Snene<br>
 Andreas Traczyk<br>
 Anthony Léonard<br>
 Brando Tovar<br>
+Capucine Berthet<br>
+Charles-Francis Damedey<br>
 Cyrille Béraud<br>
 Dorina Mosku<br>
 Eden Abitbol<br>
 Édric Milaret<br>
 Éloi Bail<br>
+Emma Falkiewitz<br>
 Emmanuel Lepage-Vallée<br>
 Fadi Shehadeh<br>
 Franck Laurent<br>
@@ -26,7 +32,10 @@ Hadrien De Sousa<br>
 Hugo Lefeuvre<br>
 Julien Grossholtz<br>
 Kateryna Kostiuk<br>
+Léo Banno-Cloutier<br>
+Liam Courdoson<br>
 Loïc Siret<br>
+Mathéo Joseph<br>
 Mingrui Zhang<br>
 Mohamed Chibani<br>
 Mohamed Amine Younes Bouacida<br>
@@ -40,6 +49,7 @@ Peymane Marandi<br>
 Philippe Gorley<br>
 Pierre Duchemin<br>
 Pierre Lespagnol<br>
+Pierre Nicolas<br>
 Raphaël Brulé<br>
 Rayan Osseiran<br>
 Romain Bertozzi<br>
@@ -53,7 +63,8 @@ Thibault Wittemberg<br>
 Thomas Ballasi<br>
 Trevor Tabah<br>
 Vsevolod Ivanov<br>
+Xavier Jouslin de Noray<br>
 Yang Wang<br></p>
-<h3 align="center"><span style="font-weight:600"> ARTWORK BY:</span></h3>
+<h4 align="left"><span style="font-weight:600"> Artwork by</span></h4>
 <p>Charlotte Hoffmann<br>
 Marianne Forget<br></p>

src/app/MainApplicationWindow.qml

@@ -273,7 +273,8 @@ ApplicationWindow {
                 "infoText": infoText,
                 "buttonTitles": [JamiStrings.optionOk],
                 "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue],
-                "buttonCallBacks": []
+                "buttonCallBacks": [],
+                "buttonRoles": [DialogButtonBox.AcceptRole]
             });
     }
 
@@ -285,7 +286,8 @@ ApplicationWindow {
                 "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue, SimpleMessageDialog.ButtonStyle.TintedBlue],
                 "buttonCallBacks": [function () {
                         AppVersionManager.applyUpdates(switchToBeta);
-                    }]
+                    }],
+                "buttonRoles": [DialogButtonBox.AcceptRole, DialogButtonBox.RejectRole]
             });
     }
 

src/app/appsettingsmanager.h

@@ -20,20 +20,21 @@
 
 #pragma once
 
-#include "utils.h"
-
 #include <QMetaEnum>
 #include <QObject>
 #include <QString>
 #include <QStandardPaths>
 #include <QWindow> // for QWindow::AutomaticVisibility
+#include <QSettings>
+#include <QDir>
 
 #include <QTranslator>
 
 extern const QString defaultDownloadPath;
 
 // clang-format off
-#define KEYS \
+// Common key-value pairs for both APPSTORE and non-APPSTORE builds
+#define COMMON_KEYS \
     X(MinimizeOnClose, false) \
     X(DownloadPath, defaultDownloadPath) \
     X(ScreenshotPath, {}) \
@@ -64,7 +65,19 @@ extern const QString defaultDownloadPath;
     X(ShowMardownOption, false) \
     X(ChatViewEnterIsNewLine, false) \
     X(ShowSendOption, false) \
-    X(DonateVisibleDate,  "2999-02-01 05:00")
+    X(EnablePtt, false) \
+    X(PttKeys, 32)
+#ifdef APPSTORE
+#define KEYS COMMON_KEYS
+#else
+// Additional key-value pairs for non-APPSTORE builds including donation
+// related settings.
+#define KEYS COMMON_KEYS \
+    X(Donation2023VisibleDate, "2023-11-27 05:00") \
+    X(IsDonationVisible, true) \
+    X(Donation2023EndDate, "2024-01-31 00:00")
+#endif
+
 /*
  * A class to expose settings keys in both c++ and QML.
  * Note: this is using a non-constructable class instead of a
@@ -102,8 +115,9 @@ public:
         default: return {};
         }
     }
+
 private:
-     Settings() = delete;
+    Settings() = delete;
 };
 Q_DECLARE_METATYPE(Settings::Key)
 // clang-format on

src/app/avadapter.cpp

@@ -195,8 +195,22 @@ AvAdapter::shareFile(const QString& filePath)
     auto callId = lrcInstance_->getCurrentCallId();
     if (!callId.isEmpty()) {
         muteCamera_ = !isCapturing();
-        lrcInstance_->getCurrentCallModel()
-            ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING);
+        auto resource = QString("%1%2%3")
+                            .arg(libjami::Media::VideoProtocolPrefix::FILE)
+                            .arg(libjami::Media::VideoProtocolPrefix::SEPARATOR)
+                            .arg(QUrl(filePath).toLocalFile());
+
+        Utils::oneShotConnect(&lrcInstance_->avModel(),
+                              &lrc::api::AVModel::fileOpened,
+                              this,
+                              [this, callId, filePath, resource](bool hasAudio, bool hasVideo) {
+                                    lrcInstance_->avModel().setAutoRestart(resource, true);
+                                    lrcInstance_->getCurrentCallModel()
+                                        ->addMedia(callId, filePath, lrc::api::CallModel::MediaRequestType::FILESHARING, false, hasAudio);
+                                    lrcInstance_->avModel().pausePlayer(resource, false);
+                              });
+
+        lrcInstance_->avModel().createMediaPlayer(resource);
     }
 }
 
@@ -300,14 +314,16 @@ AvAdapter::stopSharing(const QString& source)
                 ->removeMedia(callId,
                               libjami::Media::Details::MEDIA_TYPE_VIDEO,
                               libjami::Media::VideoProtocolPrefix::DISPLAY,
-                              muteCamera_);
+                              muteCamera_,
+                              true);
         } else {
             qDebug() << "Stopping file: " << source;
             lrcInstance_->getCurrentCallModel()
                 ->removeMedia(callId,
                               libjami::Media::Details::MEDIA_TYPE_VIDEO,
                               libjami::Media::VideoProtocolPrefix::FILE,
-                              muteCamera_);
+                              muteCamera_,
+                              true);
         }
     }
 }

src/app/avatarregistry.cpp

@@ -27,7 +27,8 @@ AvatarRegistry::AvatarRegistry(LRCInstance* instance, QObject* parent)
     connect(lrcInstance_,
             &LRCInstance::currentAccountIdChanged,
             this,
-            &AvatarRegistry::connectAccount);
+            &AvatarRegistry::connectAccount,
+            Qt::DirectConnection);
 
     connect(&lrcInstance_->accountModel(),
             &AccountModel::profileUpdated,

src/app/calladapter.cpp

@@ -7,6 +7,7 @@
  * Author: Isa Nanic <isa.nanic@savoirfairelinux.com>
  * Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  * Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
+ * Author: Capucine Berthet <capucine.berthet@savoirfairelinux.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,29 +26,36 @@
 #include "calladapter.h"
 
 #include "systemtray.h"
-#include "utils.h"
 #include "qmlregister.h"
-
-#include <QApplication>
-#include <QTimer>
-#include <QJsonObject>
+#include "appsettingsmanager.h"
 
 #include <api/callmodel.h>
 #include <api/callparticipantsmodel.h>
 
 #include <media_const.h>
 
-CallAdapter::CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject* parent)
+#include <QApplication>
+#include <QTimer>
+#include <QJsonObject>
+
+CallAdapter::CallAdapter(AppSettingsManager* settingsManager,
+                         SystemTray* systemTray,
+                         LRCInstance* instance,
+                         QObject* parent)
     : QmlAdapterBase(instance, parent)
     , systemTray_(systemTray)
     , callInformationListModel_(std::make_unique<CallInformationListModel>())
+    , listener_(new PTTListener(settingsManager, this))
 {
+    // Expose the Push-to-talk listener to QML as a singleton
+    QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, listener_, "PttListener");
+
     set_callInformationList(QVariant::fromValue(callInformationListModel_.get()));
 
     timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, &CallAdapter::updateAdvancedInformation);
 
-    overlayModel_.reset(new CallOverlayModel(lrcInstance_, this));
+    overlayModel_.reset(new CallOverlayModel(lrcInstance_, listener_, this));
     QML_REGISTERSINGLETONTYPE_POBJECT(NS_MODELS, overlayModel_.get(), "CallOverlayModel");
 
     accountId_ = lrcInstance_->get_currentAccountId();
@@ -97,6 +105,65 @@ CallAdapter::CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject*
             &LRCInstance::selectedConvUidChanged,
             this,
             &CallAdapter::saveConferenceSubcalls);
+
+#ifdef HAVE_GLOBAL_PTT
+    connectPtt();
+#endif
+}
+
+CallAdapter::~CallAdapter()
+{
+#ifdef HAVE_GLOBAL_PTT
+    disconnectPtt();
+#endif
+}
+
+void
+CallAdapter::connectPtt()
+{
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState()) {
+        QObject::connect(
+            listener_,
+            &PTTListener::pttKeyPressed,
+            this,
+            [this]() {
+                const auto callId
+                    = lrcInstance_->getCallIdForConversationUid(lrcInstance_->get_selectedConvUid(),
+                                                                accountId_);
+                try {
+                    isMicrophoneMuted_ = isMuted(callId);
+                    if (isMicrophoneMuted_)
+                        muteAudioToggle();
+                } catch (const std::exception& e) {
+                    qWarning() << e.what();
+                }
+            },
+            Qt::QueuedConnection);
+
+        QObject::connect(
+            listener_,
+            &PTTListener::pttKeyReleased,
+            this,
+            [this]() {
+                if (isMicrophoneMuted_) {
+                    muteAudioToggle();
+                }
+            },
+            Qt::QueuedConnection);
+    }
+#endif
+}
+
+void
+CallAdapter::disconnectPtt()
+{
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState()) {
+        QObject::disconnect(listener_, &PTTListener::pttKeyPressed, this, nullptr);
+        QObject::disconnect(listener_, &PTTListener::pttKeyReleased, this, nullptr);
+    }
+#endif
 }
 
 void
@@ -172,6 +239,12 @@ CallAdapter::onCallStarted(const QString& callId)
     // update call Information list by adding the new information related to the callId
     callInformationListModel_->addElement(
         qMakePair(callId, callModel->advancedInformationForCallId(callId)));
+    if (listener_->getPttState()) {
+#ifdef HAVE_GLOBAL_PTT
+        listener_->startListening();
+        toMute += callId;
+#endif
+    }
 }
 
 void
@@ -181,6 +254,10 @@ CallAdapter::onCallEnded(const QString& callId)
         return;
     // update call Information list by removing information related to the callId
     callInformationListModel_->removeElement(callId);
+#ifdef HAVE_GLOBAL_PTT
+    if (listener_->getPttState() && !hasCall_)
+        listener_->stopListening();
+#endif
 }
 
 void
@@ -271,6 +348,15 @@ CallAdapter::onCallStatusChanged(const QString& callId, int code)
     }
 }
 
+void
+CallAdapter::onCallInfosChanged(const QString& accountId, const QString& callId)
+{
+    Q_UNUSED(accountId)
+    auto mute = toMute.remove(callId);
+    if (mute && listener_->getPttState())
+        muteAudioToggle();
+}
+
 void
 CallAdapter::onCallAddedToConference(const QString& callId, const QString& confId)
 {
@@ -494,6 +580,12 @@ CallAdapter::connectCallModel(const QString& accountId)
             QOverload<const QString&, int>::of(&CallAdapter::onCallStatusChanged),
             Qt::UniqueConnection);
 
+    connect(accInfo.callModel.get(),
+            &CallModel::callInfosChanged,
+            this,
+            &CallAdapter::onCallInfosChanged,
+            Qt::UniqueConnection);
+
     connect(accInfo.callModel.get(),
             &CallModel::callAddedToConference,
             this,
@@ -816,6 +908,23 @@ CallAdapter::holdThisCallToggle()
     }
 }
 
+bool
+CallAdapter::isMuted(const QString& callId)
+{
+    if (!(callId.isEmpty() || !lrcInstance_->getCurrentCallModel()->hasCall(callId))) {
+        auto* callModel = lrcInstance_->getCurrentCallModel();
+        if (callModel->hasCall(callId)) {
+            const auto callInfo = lrcInstance_->getCurrentCallModel()->getCall(callId);
+            auto mute = false;
+            for (const auto& m : callInfo.mediaList)
+                if (m[libjami::Media::MediaAttributeKey::LABEL] == "audio_0")
+                    mute = m[libjami::Media::MediaAttributeKey::MUTED] == TRUE_STR;
+            return mute;
+        }
+    }
+    throw std::runtime_error("CallAdapter::isMuted: callId is empty or call does not exist");
+}
+
 void
 CallAdapter::muteAudioToggle()
 {
@@ -825,13 +934,10 @@ CallAdapter::muteAudioToggle()
         return;
     }
     auto* callModel = lrcInstance_->getCurrentCallModel();
-    if (callModel->hasCall(callId)) {
-        const auto callInfo = lrcInstance_->getCurrentCallModel()->getCall(callId);
-        auto mute = false;
-        for (const auto& m : callInfo.mediaList)
-            if (m[libjami::Media::MediaAttributeKey::LABEL] == "audio_0")
-                mute = m[libjami::Media::MediaAttributeKey::MUTED] == FALSE_STR;
-        callModel->muteMedia(callId, "audio_0", mute);
+    try {
+        callModel->muteMedia(callId, "audio_0", !isMuted(callId));
+    } catch (const std::exception& e) {
+        qWarning() << e.what();
     }
 }
 
@@ -877,7 +983,8 @@ CallAdapter::muteCameraToggle()
             callModel->removeMedia(callId,
                                    libjami::Media::Details::MEDIA_TYPE_VIDEO,
                                    libjami::Media::VideoProtocolPrefix::CAMERA,
-                                   mute);
+                                   mute,
+                                   false);
         else
             callModel->addMedia(callId,
                                 lrcInstance_->avModel().getCurrentVideoCaptureDevice(),

src/app/calladapter.h

@@ -25,6 +25,10 @@
 #include "screensaver.h"
 #include "calloverlaymodel.h"
 
+#ifdef HAVE_GLOBAL_PTT
+#include "pttlistener.h"
+#endif
+
 #include <QObject>
 #include <QString>
 #include <QVariant>
@@ -33,6 +37,7 @@
 #include "callInformationListModel.h"
 
 class SystemTray;
+class AppSettingsManager;
 
 class CallAdapter final : public QmlAdapterBase
 {
@@ -45,8 +50,11 @@ public:
     enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
     Q_ENUM(MuteStates)
 
-    explicit CallAdapter(SystemTray* systemTray, LRCInstance* instance, QObject* parent = nullptr);
-    ~CallAdapter() = default;
+    explicit CallAdapter(AppSettingsManager* settingsManager,
+                         SystemTray* systemTray,
+                         LRCInstance* instance,
+                         QObject* parent = nullptr);
+    ~CallAdapter();
 
 public:
     Q_INVOKABLE void startTimerInformation();
@@ -76,6 +84,9 @@ public:
     Q_INVOKABLE void holdThisCallToggle();
     Q_INVOKABLE void recordThisCallToggle();
     Q_INVOKABLE void muteAudioToggle();
+    Q_INVOKABLE bool isMuted(const QString& callId);
+    Q_INVOKABLE void connectPtt();
+    Q_INVOKABLE void disconnectPtt();
     Q_INVOKABLE void muteCameraToggle();
     Q_INVOKABLE bool isRecordingThisCall();
     Q_INVOKABLE void muteParticipant(const QString& accountUri,
@@ -109,6 +120,7 @@ public Q_SLOTS:
     void onCallAddedToConference(const QString& callId, const QString& confId);
     void onCallStarted(const QString& callId);
     void onCallEnded(const QString& callId);
+    void onCallInfosChanged(const QString& accountId, const QString& callId);
 
 private:
     void showNotification(const QString& accountId, const QString& convUid);
@@ -121,6 +133,9 @@ private:
     SystemTray* systemTray_;
     QScopedPointer<CallOverlayModel> overlayModel_;
     VectorString currentConfSubcalls_;
-
     std::unique_ptr<CallInformationListModel> callInformationListModel_;
+
+    PTTListener* listener_;
+    bool isMicrophoneMuted_ = true;
+    QSet<QString> toMute;
 };

src/app/calloverlaymodel.cpp

@@ -22,6 +22,7 @@
 #include <QEvent>
 #include <QMouseEvent>
 #include <QQuickWindow>
+#include <QKeyEvent>
 
 IndexRangeFilterProxyModel::IndexRangeFilterProxyModel(QAbstractListModel* parent)
     : QSortFilterProxyModel(parent)
@@ -74,10 +75,10 @@ PendingConferenceesListModel::data(const QModelIndex& index, int role) const
     using namespace PendingConferences;
 
     // WARNING: not swarm ready
+    lrc::api::call::Status callStatus;
     QString pendingConferenceeCallId;
     QString pendingConferenceeContactUri;
     ContactModel* contactModel {nullptr};
-    lrc::api::call::Status callStatus;
     try {
         auto callModel = lrcInstance_->getCurrentCallModel();
         auto currentPendingConferenceeInfo = callModel->getPendingConferencees().at(index.row());
@@ -268,7 +269,7 @@ CallControlListModel::clearData()
     data_.clear();
 }
 
-CallOverlayModel::CallOverlayModel(LRCInstance* instance, QObject* parent)
+CallOverlayModel::CallOverlayModel(LRCInstance* instance, PTTListener* listener, QObject* parent)
     : QObject(parent)
     , lrcInstance_(instance)
     , primaryModel_(new CallControlListModel(this))
@@ -283,6 +284,10 @@ CallOverlayModel::CallOverlayModel(LRCInstance* instance, QObject* parent)
             this,
             &CallOverlayModel::setControlRanges);
     overflowVisibleModel_->setFilterRole(CallControl::Role::UrgentCount);
+
+#ifndef HAVE_GLOBAL_PTT
+    listener_ = listener;
+#endif
 }
 
 void
@@ -386,6 +391,19 @@ CallOverlayModel::eventFilter(QObject* object, QEvent* event)
             }
         }
     }
+#ifndef HAVE_GLOBAL_PTT
+    else if (event->type() == QEvent::KeyPress && listener_->getPttState()) {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == listener_->getCurrentKey() && !keyEvent->isAutoRepeat()) {
+            Q_EMIT pttKeyPressed();
+        }
+    } else if (event->type() == QEvent::KeyRelease && listener_->getPttState()) {
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+        if (keyEvent->key() == listener_->getCurrentKey() && !keyEvent->isAutoRepeat()) {
+            Q_EMIT pttKeyReleased();
+        }
+    }
+#endif
     return QObject::eventFilter(object, event);
 }
 

src/app/calloverlaymodel.h

@@ -21,6 +21,9 @@
 
 #include "lrcinstance.h"
 #include "qtutils.h"
+#include "mainapplication.h"
+
+#include "pttlistener.h"
 
 #include <QAbstractListModel>
 #include <QObject>
@@ -36,7 +39,7 @@
 
 namespace CallControl {
 Q_NAMESPACE
-enum Role { ItemAction = Qt::UserRole + 1, UrgentCount, Enabled};
+enum Role { ItemAction = Qt::UserRole + 1, UrgentCount, Enabled };
 Q_ENUM_NS(Role)
 
 struct Item
@@ -121,7 +124,7 @@ class CallOverlayModel : public QObject
     QML_PROPERTY(int, overflowIndex)
 
 public:
-    CallOverlayModel(LRCInstance* instance, QObject* parent = nullptr);
+    CallOverlayModel(LRCInstance* instance, PTTListener* listener, QObject* parent = nullptr);
 
     Q_INVOKABLE void addPrimaryControl(const QVariant& action, bool enabled);
     Q_INVOKABLE void addSecondaryControl(const QVariant& action, bool enabled);
@@ -142,6 +145,8 @@ public:
 
 Q_SIGNALS:
     void mouseMoved(QQuickItem* item);
+    void pttKeyPressed();
+    void pttKeyReleased();
 
 private Q_SLOTS:
     void setControlRanges();
@@ -157,4 +162,8 @@ private:
     PendingConferenceesListModel* pendingConferenceesModel_;
 
     QList<QQuickItem*> watchedItems_;
+
+#ifndef HAVE_GLOBAL_PTT
+    PTTListener* listener_ {nullptr};
+#endif
 };

src/app/commoncomponents/BaseModalDialog.qml

@@ -28,17 +28,27 @@ Popup {
     // convient access to closePolicy
     property bool autoClose: true
     property alias backgroundColor: container.color
+    property alias backgroundOpacity: container.background.opacity
     property alias title: titleText.text
     property var popupcontainerSubContentLoader: containerSubContentLoader
-    property bool topLayoutVisible: true
+
+    property bool closeButtonVisible: true
+    property int button1Role
+    property int button2Role
+
+    property alias button1: action1
+    property alias button2: action2
+
     property alias popupContentLoadStatus: containerSubContentLoader.status
     property alias popupContent: containerSubContentLoader.sourceComponent
-    property int popupContentMargins: JamiTheme.preferredMarginSize
+
+    property int popupMargins: 30
+    property int buttonMargin: 20
+    property int maximumPopupWidth: 600
 
     parent: Overlay.overlay
     anchors.centerIn: parent
     modal: true
-    padding: popupContentMargins
 
     focus: true
     closePolicy: autoClose ? (Popup.CloseOnEscape | Popup.CloseOnPressOutside) : Popup.NoAutoClose
@@ -47,13 +57,13 @@ Popup {
         id: container
 
         property color color: JamiTheme.secondaryBackgroundColor
-        padding: popupContentMargins
-        anchors.margins: popupContentMargins
         anchors.centerIn: parent
+        leftPadding: popupMargins
+        bottomPadding: action1.visible || action2.visible ? 10 :popupMargins
 
         background: Rectangle {
             id: bgRect
-            radius: JamiTheme.modalPopupRadius
+            radius: 5
             color: container.color
             layer.enabled: true
             layer.effect: DropShadow {
@@ -70,37 +80,95 @@ Popup {
         contentItem: ColumnLayout {
             id: contentLayout
 
-            RowLayout {
-                Layout.preferredWidth: parent.width
-                Layout.bottomMargin: JamiTheme.preferredMarginSize
-                visible: topLayoutVisible
+            JamiPushButton {
+                id: closeButton
 
-                Label {
-                    id: titleText
+                visible: closeButtonVisible
 
-                    Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-                    font.pointSize: JamiTheme.menuFontSize
-                    color: JamiTheme.textColor
+                Layout.alignment: Qt.AlignRight | Qt.AlignTop
+                Layout.preferredHeight: 20
+                Layout.preferredWidth: 20
+                Layout.topMargin: 5
+                Layout.rightMargin: 5
 
+                imageColor: hovered ? JamiTheme.textColor : JamiTheme.buttonTintedGreyHovered
+                normalColor: "transparent"
 
-                    visible: text.length > 0
-                }
-
-                JamiPushButton {
-                    id: closeButton
-                    Layout.alignment: Qt.AlignRight
-                    imageColor: "grey"
-                    normalColor: "transparent"
-
-                    source: JamiResources.round_close_24dp_svg
-                    onClicked: close()
-                }
+                source: JamiResources.round_close_24dp_svg
+                onClicked: close()
             }
 
-            Loader {
-                id: containerSubContentLoader
+            Label {
+                id: titleText
 
+                Layout.rightMargin: popupMargins
+                Layout.bottomMargin: 20
+                Layout.topMargin: closeButtonVisible ? 0 : 30
+                Layout.alignment: Qt.AlignLeft
+
+                font.pointSize: JamiTheme.menuFontSize
+                color: JamiTheme.textColor
+                font.bold: true
+
+                visible: text.length > 0
+            }
+
+            JamiFlickable {
+                id: flickable
+
+                Layout.fillHeight: true
+
+                Layout.preferredHeight: Math.min(contentHeight, root.height)
+                Layout.preferredWidth: contentItem.childrenRect.width
+                Layout.rightMargin: popupMargins
                 Layout.alignment: Qt.AlignCenter
+
+                contentHeight: contentItem.childrenRect.height
+
+                contentItem.children: Loader {
+                    id: containerSubContentLoader
+                }
+                ScrollBar.horizontal.visible: false
+            }
+
+            DialogButtonBox {
+                id: buttonBox
+                Layout.alignment: Qt.AlignRight
+                spacing: 1.5
+
+                background: Rectangle {
+
+                    color: "transparent"
+                    width: buttonBox.childrenRect.width
+                    height: buttonBox.childrenRect.height
+                }
+
+                visible: action1.text.length > 0
+                contentHeight: childrenRect.height + 14
+
+                MaterialButton {
+                    id: action1
+
+                    visible: text.length > 0
+                    rightPadding: buttonMargin
+                    leftPadding: buttonMargin
+                    tertiary: true
+                    autoAccelerator: true
+
+                    DialogButtonBox.buttonRole: root.button1Role
+                }
+
+                MaterialButton {
+                    id: action2
+
+                    visible: text.length > 0
+                    rightPadding: buttonMargin
+                    leftPadding: buttonMargin
+                    tertiary: true
+                    autoAccelerator: true
+
+                    DialogButtonBox.buttonRole: root.button2Role
+                }
             }
         }
     }

src/app/commoncomponents/CallMessageDelegate.qml

@@ -25,15 +25,17 @@ import net.jami.Constants 1.1
 SBSMessageBase {
     id: root
 
-    component JoinCallButton: PushButton {
+    component JoinCallButton: MaterialButton {
         visible: root.isActive
         toolTipText: JamiStrings.joinCall
-        preferredSize: visible ? 40 : 0
-        imageColor: callLabel.color
-        normalColor: "transparent"
-        hoveredColor: Qt.rgba(255, 255, 255, 0.2)
-        border.width: 1
-        border.color: callLabel.color
+        color: JamiTheme.blackColor
+        background.opacity: hovered ? 0.2 : 0.1
+        hoveredColor: JamiTheme.blackColor
+        contentColorProvider: JamiTheme.textColor
+        textOpacity: hovered ? 1 : 0.5
+        buttontextHeightMargin: 16
+        textLeftPadding: 9
+        textRightPadding: 9
     }
 
     property bool isRemoteImage
@@ -43,6 +45,9 @@ SBSMessageBase {
     readers: Readers
     formattedTime: MessagesAdapter.getFormattedTime(Timestamp)
 
+    bubble.border.color: CurrentConversation.color
+    bubble.border.width: root.isActive ? 1.5 : 0
+
     Connections {
         target: CurrentConversation
         enabled: root.isActive
@@ -56,13 +61,6 @@ SBSMessageBase {
     visible: isActive || ConfId === "" || Duration > 0
 
     property var baseColor: isOutgoing? CurrentConversation.color : JamiTheme.messageInBgColor
-    bubble.color: {
-        if (ConfId === "" && Duration === 0) {
-            // If missed, we can add a darker pattern
-            return Qt.lighter(root.baseColor, 1.15)
-        }
-        return root.baseColor
-    }
 
     innerContent.children: [
         RowLayout {
@@ -73,20 +71,21 @@ SBSMessageBase {
 
             Label {
                 id: callLabel
-                padding: 10
+
                 Layout.margins: 8
                 Layout.fillWidth: true
+                Layout.rightMargin: root.isActive ? 0 : root.timeWidth + 16
+                Layout.leftMargin: root.isActive ? 10 : 8
 
                 text: {
                     if (root.isActive)
-                        return JamiStrings.joinCall;
+                        return JamiStrings.startedACall;
                     return Body;
                 }
                 horizontalAlignment: Qt.AlignHCenter
 
                 font.pointSize: JamiTheme.mediumFontSize
                 font.hintingPreference: Font.PreferNoHinting
-                font.bold: true
                 renderType: Text.NativeRendering
                 textFormat: Text.MarkdownText
 
@@ -95,17 +94,21 @@ SBSMessageBase {
 
             JoinCallButton {
                 id: joinCallInAudio
+                Layout.topMargin: 4
+                Layout.bottomMargin: 4
 
-                source: JamiResources.place_audiocall_24dp_svg
+                text: JamiStrings.joinInAudio
                 onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, ConfId, true)
             }
 
             JoinCallButton {
                 id: joinCallInVideo
+                text: JamiStrings.joinInVideo
+                Layout.topMargin: 4
+                Layout.bottomMargin: 4
 
-                source: JamiResources.videocam_24dp_svg
                 onClicked: MessagesAdapter.joinCall(ActionUri, DeviceId, ConfId)
-                Layout.rightMargin: parent.spacing
+                Layout.rightMargin: 4
             }
         }
     ]
@@ -116,5 +119,8 @@ SBSMessageBase {
             duration: 100
         }
     }
-    Component.onCompleted: opacity = 1
+    Component.onCompleted: {
+        bubble.timestampItem.visible = !root.isActive;
+        opacity = 1;
+    }
 }

src/app/commoncomponents/ChangePttKeyPopup.qml

@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2023 Savoir-faire Linux Inc.
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import net.jami.Models 1.1
+import net.jami.Adapters 1.1
+import net.jami.Constants 1.1
+
+BaseModalDialog {
+    id: pttPage
+
+    property string bestName: ""
+    property string accountId: ""
+    property int pressedKey: Qt.Key_unknown
+
+    closeButtonVisible: false
+
+    button1.text: JamiStrings.assign
+    button2.text: JamiStrings.cancel
+
+    button1Role: DialogButtonBox.ApplyRole
+    button2Role: DialogButtonBox.RejectRole
+    button1.onClicked: {
+        if (!(pressedKey === Qt.Key_unknown)){
+            PttListener.setPttKey(pressedKey);
+            choiceMade(pressedKey);
+        }
+        close();
+    }
+    button2.onClicked: close();
+
+    signal accepted
+    signal choiceMade(int chosenKey)
+
+    title: JamiStrings.changeShortcut
+
+    popupContent: ColumnLayout {
+        id: deleteAccountContentColumnLayout
+        anchors.centerIn: parent
+        spacing: 20
+
+        Component.onCompleted: keyItem.forceActiveFocus()
+        Label {
+            id: instructionLabel
+
+            Layout.alignment: Qt.AlignLeft
+            Layout.preferredWidth: JamiTheme.preferredDialogWidth - 4*JamiTheme.preferredMarginSize
+            color: JamiTheme.textColor
+            text: JamiStrings.assignmentIndication
+
+            verticalAlignment: Text.AlignVCenter
+
+            font.pointSize: JamiTheme.settingsFontSize
+            font.kerning: true
+
+            wrapMode: Text.Wrap
+        }
+
+        Label {
+            id: keyLabel
+            Layout.alignment: Qt.AlignLeft
+            Layout.leftMargin: JamiTheme.preferredMarginSize
+
+            color: JamiTheme.blackColor
+            wrapMode: Text.WordWrap
+            text: ""
+            font.pointSize: JamiTheme.textFontSize
+            font.kerning: true
+
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            background: Rectangle {
+                 id: backgroundRect
+
+                 anchors.centerIn: parent
+
+                 width: keyLabel.width + 2 * JamiTheme.preferredMarginSize
+                 height: keyLabel.height + JamiTheme.preferredMarginSize
+                 color: JamiTheme.lightGrey_
+                 border.color: JamiTheme.darkGreyColor
+                 radius: 4
+            }
+        }
+
+        Item {
+            id: keyItem
+
+            Keys.onPressed: (event)=>{
+                keyLabel.text = PttListener.keyToString(event.key);
+                pressedKey = event.key;
+            }
+        }
+    }
+}

src/app/commoncomponents/ConfirmDialog.qml

@@ -30,6 +30,19 @@ BaseModalDialog {
     property string confirmLabel: ""
     property string textLabel: ""
 
+    closeButtonVisible: false
+    button1.text: confirmLabel
+    button1.contentColorProvider: JamiTheme.redButtonColor
+    button1.onClicked: {
+        close();
+        accepted();
+    }
+    button2.text: JamiStrings.optionCancel
+    button2.onClicked: close()
+
+    button1Role: DialogButtonBox.AcceptRole
+    button2Role: DialogButtonBox.RejectRole
+
     popupContent: ColumnLayout {
         id: column
 
@@ -49,51 +62,5 @@ BaseModalDialog {
             verticalAlignment: Text.AlignVCenter
             wrapMode: Text.Wrap
         }
-
-        RowLayout {
-            spacing: 16
-            Layout.alignment: Qt.AlignCenter
-            Layout.topMargin: JamiTheme.preferredMarginSize
-
-            MaterialButton {
-                id: primaryBtn
-
-                Layout.alignment: Qt.AlignHCenter
-                text: root.confirmLabel
-
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                color: JamiTheme.buttonTintedRed
-                hoveredColor: JamiTheme.buttonTintedRedHovered
-                pressedColor: JamiTheme.buttonTintedRedPressed
-                secondary: true
-                autoAccelerator: true
-
-                onClicked: {
-                    close();
-                    accepted();
-                }
-            }
-
-            MaterialButton {
-                id: btnCancel
-
-                Layout.alignment: Qt.AlignHCenter
-
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                buttontextHeightMargin: JamiTheme.buttontextHeightMargin
-
-                color: JamiTheme.buttonTintedBlack
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
-                autoAccelerator: true
-
-                text: JamiStrings.optionCancel
-
-                onClicked: close()
-            }
-        }
     }
 }

src/app/commoncomponents/DaemonReconnectPopup.qml

@@ -29,6 +29,11 @@ BaseModalDialog {
 
     autoClose: false
 
+    button1.text: JamiStrings.optionOk
+    button1Role: DialogButtonBox.AcceptRole
+    button1.visible: connectionFailed
+    button1.onClicked: Qt.quit()
+
     Connections {
         target: {
             if (Qt.platform.os.toString() !== "windows" && Qt.platform.os.toString() !== "osx")
@@ -51,10 +56,10 @@ BaseModalDialog {
     onPopupContentLoadStatusChanged: {
         if (popupContentLoadStatus === Loader.Ready) {
             root.height = Qt.binding(function () {
-                    return popupContentLoader.item.implicitHeight + 50;
+                    return popupContent.implicitHeight + 50;
                 });
             root.width = Qt.binding(function () {
-                    return popupContentLoader.item.implicitWidth + 50;
+                    return popupContent.implicitWidth + 50;
                 });
         }
     }
@@ -94,24 +99,5 @@ BaseModalDialog {
             smooth: true
             fillMode: Image.PreserveAspectFit
         }
-
-        MaterialButton {
-            id: btnOk
-
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-
-            preferredWidth: JamiTheme.preferredFieldWidth / 2
-
-            visible: connectionFailed
-
-            text: JamiStrings.optionOk
-            color: JamiTheme.buttonTintedBlue
-            hoveredColor: JamiTheme.buttonTintedBlueHovered
-            pressedColor: JamiTheme.buttonTintedBluePressed
-            secondary: true
-            autoAccelerator: true
-
-            onClicked: Qt.quit()
-        }
     }
 }

src/app/commoncomponents/DataTransferMessageDelegate.qml

@@ -79,6 +79,7 @@ Loader {
             formattedTime: root.formattedTime
             formattedDay: root.formattedTime
             extraHeight: progressBar.visible ? 18 : 0
+
             innerContent.children: [
                 RowLayout {
                     id: transferItem
@@ -104,7 +105,7 @@ Loader {
                         property string iconSourceA
                         property string iconSourceB
 
-                        Layout.margins: 12
+                        Layout.margins: 8
 
                         sourceComponent: {
                             switch (Status) {
@@ -132,14 +133,22 @@ Loader {
                         }
                         Component {
                             id: terminatedComp
-                            ResponsiveImage {
-                                source: buttonsLoader.iconSourceA
-                                Layout.leftMargin: 12
-                                Layout.preferredWidth: 24
-                                Layout.preferredHeight: 24
-                                color: UtilsAdapter.luma(bubble.color)
-                                       ? JamiTheme.chatviewTextColorLight
-                                       : JamiTheme.chatviewTextColorDark
+
+                            Control {
+                                width: 50
+                                height: 50
+                                padding: 13
+
+                                background: Rectangle {
+                                    color: JamiTheme.blackColor
+                                    opacity: 0.15
+                                    radius: msgRadius
+                                }
+
+                                contentItem: ResponsiveImage {
+                                    source: buttonsLoader.iconSourceA
+                                    color: UtilsAdapter.luma(bubble.color) ? JamiTheme.fileIconLightColor : JamiTheme.fileIconDarkColor
+                                }
                             }
                         }
                         Component {
@@ -179,7 +188,7 @@ Loader {
                     }
                     Column {
                         Layout.rightMargin: 24
-                        spacing: 6
+                        spacing: 4
                         TextEdit {
                             id: transferName
 
@@ -189,7 +198,6 @@ Loader {
                                       TransferName :
                                       Body
                             wrapMode: Label.WrapAtWordBoundaryOrAnywhere
-                            font.weight: Font.DemiBold
                             font.pointSize: 11
                             renderType: Text.NativeRendering
                             readOnly: true
@@ -217,7 +225,7 @@ Loader {
                             width: Math.min(implicitWidth, maxMsgWidth)
                             bottomPadding: 10
                             text: {
-                                var res = formattedTime + " - "
+                                var res = ""
                                 if (transferStats.totalSize !== undefined) {
                                     if (transferStats.progress !== 0 &&
                                             transferStats.progress !== transferStats.totalSize) {
@@ -226,7 +234,7 @@ Loader {
                                     var totalSize = transferStats.totalSize !== 0 ? transferStats.totalSize : TotalSize
                                     res += UtilsAdapter.humanFileSize(totalSize)
                                 }
-                                return res + " - " + MessagesAdapter.getStatusString(Status)
+                                return res
                             }
                             wrapMode: Label.WrapAtWordBoundaryOrAnywhere
                             font.pointSize: 10
@@ -257,6 +265,7 @@ Loader {
             id: localMediaMsgItem
 
             isOutgoing: Author === CurrentAccount.uri
+            property var transferStats: MessagesAdapter.getTransferStats(Id, Status)
             showTime: root.showTime
             seq: root.seq
             author: Author
@@ -266,7 +275,31 @@ Loader {
             readers: Readers
             formattedTime: MessagesAdapter.getFormattedTime(Timestamp)
             formattedDay: MessagesAdapter.getFormattedDay(Timestamp)
-            bubble.visible: false
+
+            property real contentWidth
+
+            Component.onCompleted: {
+                if (transferStats.totalSize !== undefined) {
+                    var totalSize = transferStats.totalSize !== 0 ? transferStats.totalSize : TotalSize
+                    var txt = UtilsAdapter.humanFileSize(totalSize)
+                }
+                bubble.timestampItem.timeLabel.text += " - " + txt
+                bubble.color = "transparent"
+                if (mediaInfo.isImage)
+                    bubble.z = 1
+                else
+                    timeUnderBubble = true
+            }
+
+            onContentWidthChanged: {
+                if (bubble.timestampItem.timeLabel.width > contentWidth)
+                    timeUnderBubble = true
+                else {
+                    bubble.timestampItem.timeColor = JamiTheme.whiteColor
+                    bubble.timestampItem.timeLabel.opacity = 1
+                }
+            }
+
             innerContent.children: [
                 Loader {
                     id: localMediaCompLoader
@@ -282,6 +315,9 @@ Loader {
                             return animatedImageComp
                         return avComp
                     }
+
+
+
                     Component {
                         id: avComp
 
@@ -296,6 +332,7 @@ Loader {
                     }
                     Component {
                         id: animatedImageComp
+
                         AnimatedImage {
                             id: animatedImg
 
@@ -330,12 +367,27 @@ Loader {
                                     radius: msgRadius
                                 }
                             }
-                            HoverHandler {
-                                target : parent
-                                onHoveredChanged: {
-                                    localMediaMsgItem.hoveredLink = hovered ? animatedImg.source : ""
+
+                            onWidthChanged: {
+                                localMediaMsgItem.contentWidth = width
+                            }
+
+                            Component.onCompleted: localMediaMsgItem.bubble.imgSource = source
+
+                            LinearGradient {
+                                id: gradient
+                                anchors.fill: parent
+                                start: Qt.point(0, height / 3)
+                                gradient: Gradient {
+                                    GradientStop {
+                                        position: 0.0
+                                        color: JamiTheme.transparentColor
+                                    }
+                                    GradientStop {
+                                        position: 1.0
+                                        color: JamiTheme.darkGreyColorOpacityFade
+                                    }
                                 }
-                                cursorShape: Qt.PointingHandCursor
                             }
                         }
                     }
@@ -355,6 +407,8 @@ Loader {
                             asynchronous: true
                             source: Body !== undefined ? UtilsAdapter.urlFromLocalPath(Body) : ''
 
+                            Component.onCompleted: localMediaMsgItem.bubble.imgSource = source
+
                             // The sourceSize represents the maximum source dimensions.
                             // This should not be a dynamic binding, as property changes
                             // (resizing the chat view) here will trigger a reload of the image.
@@ -369,9 +423,14 @@ Loader {
                                 if (status == Image.Ready && aspectRatio) {
                                     height = Qt.binding(() => JamiQmlUtils.clamp(idealWidth / aspectRatio, 64, 256))
                                     width = Qt.binding(() => height * aspectRatio)
+
                                 }
                             }
 
+                            onWidthChanged: {
+                                localMediaMsgItem.contentWidth = width
+                            }
+
                             Rectangle {
                                 color: JamiTheme.previewImageBackgroundColor
                                 z: -1
@@ -387,12 +446,21 @@ Loader {
                                     radius: msgRadius
                                 }
                             }
-                            HoverHandler {
-                                target : parent
-                                onHoveredChanged: {
-                                    localMediaMsgItem.hoveredLink = hovered ? img.source : ""
+
+                            LinearGradient {
+                                id: gradient
+                                anchors.fill: parent
+                                start: Qt.point(0, height / 3)
+                                gradient: Gradient {
+                                    GradientStop {
+                                        position: 0.0
+                                        color: JamiTheme.transparentColor
+                                    }
+                                    GradientStop {
+                                        position: 1.0
+                                        color: JamiTheme.darkGreyColorOpacityFade
+                                    }
                                 }
-                                cursorShape: Qt.PointingHandCursor
                             }
                         }
                     }

src/app/commoncomponents/DeleteAccountDialog.qml

@@ -26,22 +26,51 @@ BaseModalDialog {
     id: root
 
     property bool isSIP: false
-    property string bestName: ""
-    property string accountId: ""
 
     signal accepted
 
     title: JamiStrings.deleteAccount
 
+    closeButtonVisible: false
+    button1.text: JamiStrings.optionDelete
+
+    button1Role: DialogButtonBox.DestructiveRole
+    button1.onClicked: {
+        button1.enabled = false;
+        busyInd.running = true;
+        AccountAdapter.deleteCurrentAccount();
+        close();
+        accepted();
+    }
+
+    button2.text: JamiStrings.optionCancel
+    button2Role: DialogButtonBox.RejectRole
+    button2.onClicked: close();
+    button1.contentColorProvider: JamiTheme.deleteRedButton
+
+
+    BusyIndicator {
+        id: busyInd
+        running: false
+        Connections {
+            target: root
+            function onClosed() {
+                busyInd.running = false;
+            }
+        }
+    }
+
     popupContent: ColumnLayout {
         id: deleteAccountContentColumnLayout
         anchors.centerIn: parent
+        spacing: 10
 
         Label {
             id: labelDeletion
 
-            Layout.alignment: Qt.AlignHCenter
+            Layout.alignment: Qt.AlignLeft
             Layout.maximumWidth: root.width - 4*JamiTheme.preferredMarginSize
+            Layout.bottomMargin: 5
 
             color: JamiTheme.textColor
             text: JamiStrings.confirmDeleteQuestion
@@ -52,124 +81,198 @@ BaseModalDialog {
             wrapMode: Text.Wrap
         }
 
-        Label {
-            id: labelBestId
+        Rectangle {
+            id: accountRectangle
 
-            Layout.alignment: Qt.AlignHCenter
+            color: JamiTheme.backgroundRectangleColor
 
-            color: JamiTheme.textColor
-            text: bestName
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: userProfileDialogLayout.height
+            Layout.maximumWidth: root.width - 80
 
-            font.pointSize: JamiTheme.textFontSize
-            font.kerning: true
-            font.bold: true
-            wrapMode: Text.Wrap
-        }
+            radius: 5
 
-        Label {
-            id: labelAccountHash
+            ColumnLayout {
+                id: userProfileDialogLayout
 
-            Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
+                anchors.centerIn: parent
+                width: parent.width
 
-            color: JamiTheme.textColor
-            text: accountId
+                RowLayout {
+                    Layout.margins: 10
+                    Layout.fillWidth: true
 
-            font.pointSize: JamiTheme.textFontSize
-            font.kerning: true
+                    spacing: 10
 
-            horizontalAlignment: Text.AlignHCenter
-            wrapMode: Text.Wrap
-        }
+                    Avatar {
+                        id: currentAccountImage
 
-        Label {
-            id: labelWarning
+                        Layout.preferredWidth: 56
+                        Layout.preferredHeight: 56
 
-            visible: !isSIP
+                        imageId: CurrentAccount.id
+                        showPresenceIndicator: false
+                        mode: Avatar.Mode.Account
+                    }
 
-            Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: root.width - 4*JamiTheme.preferredMarginSize
+                    ColumnLayout {
 
-            text: JamiStrings.deleteAccountInfos
+                        spacing: 10
+                        Layout.alignment: Qt.AlignLeft
 
-            font.pointSize: JamiTheme.textFontSize
-            font.kerning: true
+                        // Visible when user alias is not empty and not equal to id.
+                        TextEdit {
+                            id: accountAlias
 
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            wrapMode: Text.Wrap
+                            Layout.alignment: Qt.AlignLeft
 
-            color: JamiTheme.redColor
-        }
+                            font.pointSize: JamiTheme.settingsFontSize
+                            font.kerning: true
 
-        RowLayout {
-            spacing: 16
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignCenter
+                            color: JamiTheme.textColor
+                            visible: accountDisplayName.text ? (CurrentAccount.alias === CurrentAccount.bestId ? false : true) : false
+                            selectByMouse: true
+                            readOnly: true
 
-            MaterialButton {
-                id: btnDelete
+                            wrapMode: Text.NoWrap
+                            text: textMetricsAccountAliasText.elidedText
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
 
-                Layout.alignment: Qt.AlignHCenter
-                Layout.topMargin: JamiTheme.preferredMarginSize
+                            TextMetrics {
+                                id: textMetricsAccountAliasText
 
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                buttontextHeightMargin: JamiTheme.buttontextHeightMargin
+                                font: accountAlias.font
+                                text: CurrentAccount.alias
+                                elideWidth: root.width - 200
+                                elide: Qt.ElideMiddle
+                            }
+                        }
 
-                color: JamiTheme.buttonTintedRed
-                hoveredColor: JamiTheme.buttonTintedRedHovered
-                pressedColor: JamiTheme.buttonTintedRedPressed
-                secondary: true
-                autoAccelerator: true
+                        // Visible when user name is not empty or equals to id.
+                        TextEdit {
+                            id: accountDisplayName
 
-                text: JamiStrings.optionDelete
+                            Layout.alignment: Qt.AlignLeft
 
-                Connections {
-                    target: root
-                    function onClosed() {
-                        btnDelete.enabled = true;
+                            font.pointSize: JamiTheme.textFontSize
+                            font.kerning: true
+                            color: JamiTheme.faddedFontColor
+
+                            visible: text.length && text !== CurrentAccount.alias
+                            readOnly: true
+                            selectByMouse: true
+
+                            wrapMode: Text.NoWrap
+                            text: textMetricsAccountDisplayNameText.elidedText
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+
+                            TextMetrics {
+                                id: textMetricsAccountDisplayNameText
+
+                                font: accountDisplayName.font
+                                text: CurrentAccount.bestId
+                                elideWidth: root.width - 200
+                                elide: Qt.ElideMiddle
+                            }
+                        }
                     }
                 }
+                Rectangle {
+                    Layout.fillWidth: true
 
-                onClicked: {
-                    btnDelete.enabled = false;
-                    busyInd.running = true;
-                    AccountAdapter.deleteCurrentAccount();
-                    close();
-                    accepted();
-                }
-            }
+                    visible: !isSIP
 
-            BusyIndicator {
-                id: busyInd
-                running: false
+                    radius: 5
+                    color: root.backgroundColor
 
-                Connections {
-                    target: root
-                    function onClosed() {
-                        busyInd.running = false;
+                    Layout.preferredHeight: accountId.height + 10
+                    Layout.margins: 10
+                    Layout.topMargin: 0
+                    RowLayout {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        spacing: 20
+
+                        Text {
+                            id: identifierText
+
+                            font.pointSize: JamiTheme.textFontSize
+                            text: JamiStrings.identifier
+
+                            color: JamiTheme.faddedFontColor
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+
+                            Layout.leftMargin: JamiTheme.preferredMarginSize
+                        }
+                        Label {
+                            id: accountId
+
+                            Layout.alignment: Qt.AlignLeft
+                            Layout.preferredWidth: root.width - 250
+                            Layout.rightMargin: JamiTheme.preferredMarginSize
+
+                            font.pointSize: JamiTheme.textFontSize
+                            font.kerning: true
+                            color: JamiTheme.textColor
+
+                            elide: Text.ElideRight
+                            text: CurrentAccount.uri
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+                        }
                     }
                 }
             }
+        }
+        Rectangle {
+            id: warningRectangle
 
-            MaterialButton {
-                id: btnCancel
+            color: JamiTheme.warningRedRectangle
 
-                Layout.alignment: Qt.AlignHCenter
-                Layout.topMargin: JamiTheme.preferredMarginSize
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: labelWarning.height + 20
+            Layout.maximumWidth: root.width - 80
 
-                preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-                buttontextHeightMargin: JamiTheme.buttontextHeightMargin
+            radius: 5
 
-                color: JamiTheme.buttonTintedBlack
-                hoveredColor: JamiTheme.buttonTintedBlackHovered
-                pressedColor: JamiTheme.buttonTintedBlackPressed
-                secondary: true
+            RowLayout{
+                id: warningLayout
 
-                text: JamiStrings.optionCancel
-                autoAccelerator: true
+                anchors.centerIn: parent
+                anchors.margins: 15
+                width: parent.width
 
-                onClicked: close()
+                Image{
+                    id: warningIcon
+
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 15
+
+                    source: JamiResources.notification_important_24dp_svg
+                    fillMode: Image.PreserveAspectFit
+                }
+
+                Label {
+                    id: labelWarning
+
+                    Layout.fillWidth: true
+                    Layout.margins: 15
+
+                    text: JamiStrings.deleteAccountInfos
+
+                    font.pointSize: JamiTheme.textFontSize
+                    font.kerning: true
+
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    wrapMode: Text.Wrap
+
+                    color: JamiTheme.redColor
+                }
             }
         }
     }

src/app/commoncomponents/EditedPopup.qml

@@ -25,25 +25,23 @@ import net.jami.Constants 1.1
 BaseModalDialog {
     id: root
 
-    width: JamiTheme.secondaryDialogDimension
-
     property var previousBodies: undefined
 
     popupContent: JamiListView {
-            width: root.width - 4 * JamiTheme.preferredMarginSize
+            width: 400 - 2 * root.popupMargins
+
             height: Math.min(count * 50, 150)
 
             model: root.previousBodies
 
             delegate: Rectangle {
-                width: root.width - 2 * JamiTheme.preferredMarginSize
+                width: 400 - 2 * root.popupMargins
                 height: Math.max(JamiTheme.menuItemsPreferredHeight, rowBody.implicitHeight)
                 color: index % 2 === 0 ? JamiTheme.backgroundColor : JamiTheme.secondaryBackgroundColor
 
                 RowLayout {
                     id: rowBody
                     spacing: JamiTheme.preferredMarginSize
-                    width: parent.width
                     anchors.centerIn: parent
 
                     Text {
@@ -58,7 +56,6 @@ BaseModalDialog {
 
                     Text {
                         Layout.alignment: Qt.AlignLeft
-                        Layout.fillWidth: true
 
                         TextMetrics {
                             id: metrics

src/app/commoncomponents/IdentifierUsernameTextEdit.qml

@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2022-2023 Savoir-faire Linux Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
+import net.jami.Adapters 1.1
+import net.jami.Constants 1.1
+import net.jami.Models 1.1
+
+Item {
+    id: root
+
+    property string prefixIconSrc: {
+        switch (nameRegistrationState) {
+        case UsernameTextEdit.NameRegistrationState.FREE:
+            return JamiResources.circled_green_check_svg;
+        case UsernameTextEdit.NameRegistrationState.INVALID:
+        case UsernameTextEdit.NameRegistrationState.TAKEN:
+            return JamiResources.circled_red_cross_svg;
+        case UsernameTextEdit.NameRegistrationState.BLANK:
+        default:
+            return JamiResources.person_24dp_svg;
+        }
+    }
+
+    property color prefixIconColor: {
+        switch (nameRegistrationState) {
+        case UsernameTextEdit.NameRegistrationState.FREE:
+            return "#009980";
+        case UsernameTextEdit.NameRegistrationState.INVALID:
+        case UsernameTextEdit.NameRegistrationState.TAKEN:
+            return "#CC0022";
+        case UsernameTextEdit.NameRegistrationState.BLANK:
+        default:
+            return JamiTheme.editLineColor;
+        }
+    }
+
+    property bool isActive: false
+    property string infohash: CurrentAccount.uri
+    property string accountId: CurrentAccount.id
+    property string registeredName: CurrentAccount.registeredName
+    property string staticText: root.isActive ? registeredName : (registeredName ? registeredName : infohash)
+
+    property bool editMode: false
+
+    signal keyPressed
+    signal activeChanged(bool active)
+
+    property string dynamicText
+
+    property QtObject textValidator: RegularExpressionValidator {
+        regularExpression: /[A-Za-z0-9-]{0,32}/
+    }
+
+    enum NameRegistrationState {
+        BLANK,
+        INVALID,
+        TAKEN,
+        FREE,
+        SEARCHING
+    }
+    property int nameRegistrationState: UsernameTextEdit.NameRegistrationState.BLANK
+
+    property bool inputIsValid: dynamicText.length === 0 || nameRegistrationState === UsernameTextEdit.NameRegistrationState.FREE
+
+    signal accepted
+
+    property bool btnHovered: false
+
+    Connections {
+        target: CurrentAccount
+
+        function onRegisteredNameChanged() {
+            root.editMode = false;
+        }
+    }
+
+    Connections {
+        id: registeredNameFoundConnection
+
+        target: NameDirectory
+        enabled: dynamicText.length !== 0
+
+        function onRegisteredNameFound(status, address, name) {
+            if (dynamicText === name) {
+                switch (status) {
+                case NameDirectory.LookupStatus.NOT_FOUND:
+                    nameRegistrationState = UsernameTextEdit.NameRegistrationState.FREE;
+                    break;
+                case NameDirectory.LookupStatus.ERROR:
+                case NameDirectory.LookupStatus.INVALID_NAME:
+                case NameDirectory.LookupStatus.INVALID:
+                    nameRegistrationState = UsernameTextEdit.NameRegistrationState.INVALID;
+                    break;
+                case NameDirectory.LookupStatus.SUCCESS:
+                    nameRegistrationState = UsernameTextEdit.NameRegistrationState.TAKEN;
+                    break;
+                }
+            }
+        }
+    }
+
+    Timer {
+        id: lookupTimer
+
+        repeat: false
+        interval: JamiTheme.usernameTextEditlookupInterval
+
+        onTriggered: {
+            if (dynamicText.length !== 0) {
+                nameRegistrationState = UsernameTextEdit.NameRegistrationState.SEARCHING;
+                NameDirectory.lookupName(root.accountId, dynamicText);
+            } else {
+                nameRegistrationState = UsernameTextEdit.NameRegistrationState.BLANK;
+            }
+        }
+    }
+
+    onDynamicTextChanged: lookupTimer.restart()
+
+    onActiveChanged: function (active) {
+        root.isActive = active;
+    }
+
+    onFocusChanged: {
+        if (focus)
+            editCompField.forceActiveFocus();
+    }
+
+    function startEditing() {
+        if (!registeredName) {
+            root.editMode = true;
+            editCompField.forceActiveFocus();
+            nameRegistrationState = UsernameTextEdit.NameRegistrationState.BLANK;
+        }
+    }
+
+    MaterialTextField {
+        id: editCompField
+
+        anchors.fill: parent
+
+        visible: root.editMode
+
+        onVisibleChanged: {
+            if (visible) {
+                forceActiveFocus();
+                text = staticText;
+            }
+        }
+        focus: true
+        infoTipText: JamiStrings.usernameToolTip
+        prefixIconSrc: root.prefixIconSrc
+        prefixIconColor: root.prefixIconColor
+        suffixIconSrc: JamiResources.outline_info_24dp_svg
+        suffixIconColor: JamiTheme.buttonTintedBlue
+        textColor: JamiTheme.tintedBlue
+
+        font.pixelSize: JamiTheme.jamiIdSmallFontSize
+
+        placeholderText: JamiStrings.chooseAUsername
+        onAccepted: root.accepted()
+        onRejected: root.editMode = false;
+        onKeyPressed: root.keyPressed()
+        onTextChanged: dynamicText = text;
+
+        inputIsValid: root.inputIsValid
+        onFocusChanged: {
+            if (!focus && root.editMode && !root.btnHovered)
+                rejected();
+            activeChanged(root.editMode);
+        }
+        onIsActiveChanged: activeChanged(isActive)
+        validator: root.textValidator
+        readOnly: !root.editMode
+    }
+}

src/app/commoncomponents/InfoBox.qml

@@ -21,7 +21,7 @@ import QtQuick.Controls
 import net.jami.Models 1.1
 import net.jami.Constants 1.1
 
-Rectangle {
+Control {
     id: root
 
     property string icoSource: ""
@@ -32,9 +32,7 @@ Rectangle {
     width: 190
     height: infos.implicitHeight
 
-    color: JamiTheme.transparentColor
-
-    ColumnLayout {
+    contentItem: ColumnLayout {
         id: infos
         anchors.fill: parent
 
@@ -71,7 +69,7 @@ Rectangle {
 
         Text {
 
-            Layout.preferredWidth: 180
+            Layout.preferredWidth: root.width - 10
             Layout.alignment: Qt.AlignLeft
             Layout.topMargin: 8
             Layout.bottomMargin: 15
@@ -79,6 +77,7 @@ Rectangle {
             color: JamiTheme.textColor
             wrapMode: Text.WordWrap
             text: description
+            lineHeight: 1.3
         }
     }
 }

src/app/commoncomponents/JamiIdentifier.qml

@@ -29,6 +29,10 @@ Item {
     property color backgroundColor: JamiTheme.welcomeBlockColor
     property color contentColor: JamiTheme.tintedBlue
     property bool centered: true
+    property bool validated: false
+    property bool outsideClic: false
+    property bool justChanged: false
+    property bool clic : false
     height: getHeight()
 
     function getHeight() {
@@ -38,9 +42,10 @@ Item {
     Connections {
         target: CurrentAccount
         function onIdChanged(id) {
-            if (!usernameTextEdit.readOnly) {
-                usernameTextEdit.readOnly = true;
+            if (usernameTextEdit.editMode) {
+                usernameTextEdit.editMode = false;
             }
+
         }
     }
 
@@ -52,9 +57,8 @@ Item {
 
         RoundedBorderRectangle {
             id: leftRect
-            fillColor: jamiId.backgroundColor
-            Layout.preferredWidth: childrenRect.width
-            Layout.maximumWidth: jamiId.width - rightRect.width
+            fillColor: JamiTheme.jamiIdBackgroundColor
+            Layout.preferredWidth: usernameTextEdit.visible ? childrenRect.width + JamiTheme.pushButtonMargins : childrenRect.width
             Layout.preferredHeight: childrenRect.height
             radius: {
                 "tl": 5,
@@ -71,24 +75,24 @@ Item {
                     Layout.preferredHeight: 40
                     containerHeight: 40
                     containerWidth: 40
+                    Layout.fillHeight: true
                     Layout.leftMargin: JamiTheme.pushButtonMargins
                     source: JamiResources.jami_id_logo_svg
-                    color: jamiId.contentColor
+                    color: JamiTheme.tintedBlue
                 }
 
-                UsernameTextEdit {
+                IdentifierUsernameTextEdit {
                     id: usernameTextEdit
-                    visible: !readOnly
+                    visible: editMode
                     Layout.preferredHeight: 40
+                    Layout.preferredWidth: 300
                     Layout.alignment: Qt.AlignVCenter
-                    textColor: jamiId.contentColor
-                    fontPixelSize: staticText.length > 16 || dynamicText.length > 16 ? JamiTheme.jamiIdSmallFontSize : JamiTheme.bigFontSize
+                    Layout.fillWidth: true
+
                     editMode: false
-                    isPersistent: false
-                    readOnly: true
 
                     onAccepted: {
-                        usernameTextEdit.readOnly = true;
+                        usernameTextEdit.editMode = false;
                         if (dynamicText === '') {
                             return;
                         }
@@ -96,29 +100,38 @@ Item {
                                 "registeredName": dynamicText
                             });
                         dlg.accepted.connect(function () {
-                                usernameTextEdit.nameRegistrationState = UsernameTextEdit.NameRegistrationState.BLANK;
+                                usernameTextEdit.nameRegistrationState = IdentifierUsernameTextEdit.NameRegistrationState.BLANK;
                             });
+                        dynamicText = '';
                     }
                 }
                 Label{
                     id: usernameLabel
-                    visible: usernameTextEdit.readOnly
-                    Layout.alignment: Qt.AlignVCenter
+
+                    visible: !usernameTextEdit.editMode
+
+                    verticalAlignment: Text.AlignVCenter
+
                     Layout.rightMargin: JamiTheme.pushButtonMargins
+                    Layout.bottomMargin: text === registeredName ? 5 : 0
                     Layout.maximumWidth: leftRect.width - 50
+                    Layout.fillHeight: true
                     elide: Text.ElideRight
-                    color: jamiId.contentColor
+                    color: JamiTheme.tintedBlue
                     font.pixelSize : text.length > 16 ? JamiTheme.jamiIdSmallFontSize : JamiTheme.bigFontSize
                     property string registeredName: CurrentAccount.registeredName
                     property string infohash: CurrentAccount.uri
                     text: registeredName ? registeredName : infohash
+                    onRegisteredNameChanged: {
+                        text = registeredName ? registeredName : infohash
+                    }
                 }
             }
         }
 
         RoundedBorderRectangle {
             id: rightRect
-            fillColor: jamiId.backgroundColor
+            fillColor: JamiTheme.jamiIdBackgroundColor
             Layout.preferredWidth: childrenRect.width + 2 * JamiTheme.pushButtonMargins
 
             Layout.preferredHeight: leftRect.height
@@ -142,31 +155,55 @@ Item {
                     id: btnEdit
                     anchors.leftMargin: JamiTheme.pushButtonMargins
                     visible: CurrentAccount.registeredName === ""
-                    border.color: enabled ? jamiId.contentColor : JamiTheme.buttonTintedBlack
-                    imageColor: enabled ? jamiId.contentColor : JamiTheme.buttonTintedBlack
+                    imageColor: enabled ? JamiTheme.tintedBlue : JamiTheme.buttonTintedBlack
+                    border.color: usernameTextEdit.editMode ? jamiId.contentColor : "transparent"
                     enabled: {
                         if (!usernameTextEdit.editMode)
                             return true;
                         switch (usernameTextEdit.nameRegistrationState) {
-                        case UsernameTextEdit.NameRegistrationState.BLANK:
                         case UsernameTextEdit.NameRegistrationState.FREE:
                             return true;
                         case UsernameTextEdit.NameRegistrationState.SEARCHING:
                         case UsernameTextEdit.NameRegistrationState.INVALID:
                         case UsernameTextEdit.NameRegistrationState.TAKEN:
+                        case UsernameTextEdit.NameRegistrationState.BLANK:
                             return false;
                         }
                     }
-                    source: usernameTextEdit.editMode ? JamiResources.check_black_24dp_svg : JamiResources.round_edit_24dp_svg
+                    hoverEnabled: enabled
+
+                    onHoveredChanged: {
+                        if (hovered) {
+                            usernameTextEdit.btnHovered = true;
+                        } else {
+                            usernameTextEdit.btnHovered = false;
+                        }
+                    }
+
+                    source: usernameTextEdit.editMode ? JamiResources.check_black_24dp_svg : JamiResources.assignment_ind_black_24dp_svg
                     toolTipText: JamiStrings.chooseUsername
                     onClicked: {
-                        if (usernameTextEdit.readOnly) {
+                        usernameTextEdit.forceActiveFocus();
+                        if (!usernameTextEdit.editMode) {
                             usernameTextEdit.startEditing();
-                            usernameTextEdit.readOnly = false;
+                            usernameTextEdit.editMode = true;
                         } else {
                             usernameTextEdit.accepted();
                         }
                     }
+
+                    Rectangle {
+                        width: 10
+                        height: 10
+                        visible: !usernameTextEdit.editMode
+
+                        anchors.top: parent.top
+                        anchors.right: parent.right
+                        radius: width / 2
+                        color: JamiTheme.redDotColor
+                        border.color: JamiTheme.jamiIdBackgroundColor
+                        border.width: 2
+                    }
                 }
 
                 JamiIdControlButton {
@@ -188,7 +225,7 @@ Item {
 
                 JamiIdControlButton {
                     id: btnId
-                    source: JamiResources.key_black_24dp_svg
+                    source: JamiResources.outline_info_24dp_svg
                     visible: CurrentAccount.registeredName !== ""
                     border.color: "transparent"
                     toolTipText: JamiStrings.identifierURI
@@ -217,7 +254,7 @@ Item {
         imageContainerWidth: JamiTheme.pushButtonSize
         imageContainerHeight: JamiTheme.pushButtonSize
         border.color: jamiId.contentColor
-        imageColor: jamiId.contentColor
+        imageColor: JamiTheme.tintedBlue
         duration: 0
     }
 }

src/app/commoncomponents/JamiSplitView.qml

@@ -19,6 +19,7 @@ import QtQuick.Controls
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
 
+// A SplitView that supports dynamic RTL and splitView state saving.
 SplitView {
     id: root
 
@@ -68,6 +69,7 @@ SplitView {
     }
 
     handle: Rectangle {
+        visible: !isSinglePane
         implicitWidth: JamiTheme.splitViewHandlePreferredWidth
         implicitHeight: root.height
         color: JamiTheme.primaryBackgroundColor

src/app/commoncomponents/LineEditContextMenu.qml

@@ -35,8 +35,10 @@ ContextMenuAutoLoader {
         GeneralMenuItem {
             id: copy
 
-            canTrigger: lineEditObj.selectedText.length
+            canTrigger: true
+            isActif: lineEditObj.selectedText.length
             itemName: JamiStrings.copy
+            hasIcon: false
             onClicked: {
                 lineEditObj.copy();
             }
@@ -44,9 +46,10 @@ ContextMenuAutoLoader {
         GeneralMenuItem {
             id: cut
 
-            canTrigger: lineEditObj.selectedText.length && !selectOnly
+            canTrigger: true
+            isActif: lineEditObj.selectedText.length && !selectOnly
             itemName: JamiStrings.cut
-
+            hasIcon: false
             onClicked: {
                 lineEditObj.cut();
             }
@@ -56,6 +59,7 @@ ContextMenuAutoLoader {
 
             canTrigger: !selectOnly
             itemName: JamiStrings.paste
+            hasIcon: false
             onClicked: {
                 if (customizePaste)
                     root.contextMenuRequirePaste();
@@ -76,10 +80,6 @@ ContextMenuAutoLoader {
         lineEditObj.select(selectionStart, selectionEnd);
     }
 
-    contextMenuItemPreferredHeight: JamiTheme.lineEditContextMenuItemsHeight
-    contextMenuItemPreferredWidth: JamiTheme.lineEditContextMenuItemsWidth
-    contextMenuSeparatorPreferredHeight: JamiTheme.lineEditContextMenuSeparatorsHeight
-
     Connections {
         target: root.item
         enabled: root.status === Loader.Ready

src/app/commoncomponents/LocalVideo.qml

@@ -31,6 +31,10 @@ VideoView {
             rendererId = id;
         } else {
             const forceRestart = rendererId === id;
+            if (!forceRestart) {
+                // Stop previous device
+                VideoDevices.stopDevice(rendererId);
+            }
             rendererId = VideoDevices.startDevice(id, forceRestart);
         }
     }

src/app/commoncomponents/MaterialButton.qml

@@ -39,12 +39,16 @@ AbstractButton {
     property var hoveredColor: JamiTheme.buttonTintedBlueHovered
     property var secHoveredColor: JamiTheme.secAndTertiHoveredBackgroundColor
     property var pressedColor: JamiTheme.buttonTintedBluePressed
+    property var checkedColor: JamiTheme.secAndTertiHoveredBackgroundColor
     property bool hasIcon: animatedIconSource.length !== 0 || iconSource.length !== 0
     property var preferredWidth
     property real textLeftPadding
     property real textRightPadding
     property real fontSize: JamiTheme.buttontextFontPixelSize
     property real textAlignment: Text.AlignHCenter
+    property real textOpacity: 1
+    checkable: false
+    checked: false
 
     property real buttontextHeightMargin: JamiTheme.wizardButtonHeightMargin
     height: buttontextHeightMargin + textButton.height
@@ -91,87 +95,72 @@ AbstractButton {
         return root.color;
     }
 
-    contentItem: Item {
-        id: item
+    contentItem: RowLayout {
+        anchors.verticalCenter: parent.verticalCenter
+        spacing: hasIcon ? JamiTheme.preferredMarginSize : 0
 
-        Binding on implicitWidth {
-            when: root.preferredWidth === undefined || !root.Layout.fillWidth
-            value: item.childrenRect.width
+        Component {
+            id: iconComponent
+
+            ResponsiveImage {
+                source: source_
+                Layout.preferredWidth: iconSize
+                Layout.preferredHeight: iconSize
+                color: contentColorProvider
+            }
         }
 
-        implicitHeight: childrenRect.height
+        Component {
+            id: animatedIconComponent
 
-        RowLayout {
-            anchors.verticalCenter: parent.verticalCenter
-            Binding on width {
-                when: root.preferredWidth !== undefined || root.Layout.fillWidth
-                value: root.availableWidth
+            AnimatedImage {
+                source: animatedSource_
+                Layout.preferredWidth: iconSize
+                Layout.preferredHeight: iconSize
+                width: iconSize
+                height: iconSize
+                playing: true
+                fillMode: Image.PreserveAspectFit
+                mipmap: true
+            }
+        }
+
+        Loader {
+            id: icon
+
+            property string source_
+            property string animatedSource_
+
+            active: hasIcon
+
+            Layout.preferredWidth: active * width
+
+            Layout.alignment: Qt.AlignVCenter
+            Layout.leftMargin: hasIcon ? JamiTheme.preferredMarginSize : undefined
+            sourceComponent: animatedSource_.length !== 0 ? animatedIconComponent : iconComponent
+        }
+
+        Text {
+            id: textButton
+
+            Layout.rightMargin: {
+                if ((!hasIcon || root.preferredWidth === undefined) && !root.Layout.fillWidth)
+                    return undefined;
+                return icon.width + JamiTheme.preferredMarginSize / 2 + parent.spacing;
             }
 
-            spacing: hasIcon ? JamiTheme.preferredMarginSize : 0
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignHCenter
 
-            Component {
-                id: iconComponent
-
-                ResponsiveImage {
-                    source: source_
-                    Layout.preferredWidth: iconSize
-                    Layout.preferredHeight: iconSize
-                    color: contentColorProvider
-                }
-            }
-
-            Component {
-                id: animatedIconComponent
-
-                AnimatedImage {
-                    source: animatedSource_
-                    Layout.preferredWidth: iconSize
-                    Layout.preferredHeight: iconSize
-                    width: iconSize
-                    height: iconSize
-                    playing: true
-                    fillMode: Image.PreserveAspectFit
-                    mipmap: true
-                }
-            }
-
-            Loader {
-                id: icon
-
-                property string source_
-                property string animatedSource_
-
-                active: hasIcon
-
-                Layout.preferredWidth: active * width
-
-                Layout.alignment: Qt.AlignVCenter
-                Layout.leftMargin: hasIcon ? JamiTheme.preferredMarginSize : undefined
-                sourceComponent: animatedSource_.length !== 0 ? animatedIconComponent : iconComponent
-            }
-
-            Text {
-                id: textButton
-
-                Layout.rightMargin: {
-                    if ((!hasIcon || root.preferredWidth === undefined) && !root.Layout.fillWidth)
-                        return undefined;
-                    return icon.width + JamiTheme.preferredMarginSize / 2 + parent.spacing;
-                }
-
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignHCenter
-
-                leftPadding: root.primary ? JamiTheme.buttontextWizzardPadding : textLeftPadding
-                rightPadding: root.primary ? JamiTheme.buttontextWizzardPadding : textRightPadding
-                text: root.text
-                elide: Text.ElideRight
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment: root.textAlignment
-                color: contentColorProvider
-                font.pixelSize: fontSize
-            }
+            leftPadding: root.primary ? JamiTheme.buttontextWizzardPadding : textLeftPadding
+            rightPadding: root.primary ? JamiTheme.buttontextWizzardPadding : textRightPadding
+            text: root.text
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: root.textAlignment
+            color: contentColorProvider
+            font.pixelSize: fontSize
+            opacity: root.textOpacity
         }
     }
 
@@ -187,6 +176,8 @@ AbstractButton {
             if (root.secondary || root.tertiary) {
                 if (root.hovered && root.enabled)
                     return root.secHoveredColor;
+                if (root.checked && root.checkable)
+                    return root.checkedColor;
                 return JamiTheme.transparentColor;
             }
             if (root.down)

src/app/commoncomponents/MaterialTextField.qml

@@ -36,6 +36,7 @@ TextField {
     }
 
     signal keyPressed
+    signal rejected
 
     property bool inputIsValid: true
 
@@ -47,7 +48,7 @@ TextField {
     property alias suffixBisIconColor: suffixBisIcon.color
     property alias icon: container.data
 
-    property color accent: isActive || hovered ? prefixIconColor : JamiTheme.buttonTintedBlue
+    property color accent:  (isActive || hovered ? prefixIconColor : JamiTheme.passwordBaselineColor)
     property color baseColor: JamiTheme.primaryForegroundColor
     property color textColor: JamiTheme.textColor
     color: textColor
@@ -87,6 +88,9 @@ TextField {
                 root.accepted();
             }
             event.accepted = true;
+        } else if (event.key === Qt.Key_Escape) {
+            root.focus = false;
+            root.rejected();
         } else {
             root.keyPressed();
         }
@@ -110,8 +114,11 @@ TextField {
         id: overBaseLineLabel
         font.pixelSize: root.font.pixelSize
         anchors.baseline: root.baseline
-        anchors.horizontalCenter: !isSwarmDetail ? root.horizontalCenter : undefined
+        anchors.left: root.left
+        anchors.leftMargin: 32
+        width: root.width - 64
         text: root.placeholderText
+        elide: Text.ElideRight
         color: isSwarmDetail ? root.color : root.baseColor
         visible: !root.isActive && !readOnly && root.text.toString() === ""
     }
@@ -202,12 +209,13 @@ TextField {
 
     TextFieldIcon {
         id: suffixBisIcon
-        size: 20
+        size: 16
         anchors.right: parent.right
         anchors.verticalCenter: root.verticalCenter
         anchors.verticalCenterOffset: -root.bottomPadding / 2
         color: suffixBisIconColor
         source: suffixBisIconSrc
+        opacity: 1
 
         TapHandler {
             cursorShape: Qt.ArrowCursor

src/app/commoncomponents/MessageBubble.qml

@@ -37,6 +37,7 @@ Rectangle {
 
     Rectangle {
         id: mask
+
         visible: type !== MsgSeq.single && !isReply
         z: -1
         radius: 5

src/app/commoncomponents/MessageOptionsPopup.qml

@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2022-2023 Savoir-faire Linux Inc.
- * Author: Nicolas Vengeon <nicolas.vengeon@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import QtQuick
-import QtQuick.Controls
-import Qt5Compat.GraphicalEffects
-import QtQuick.Layouts
-
-import net.jami.Models 1.1
-import net.jami.Adapters 1.1
-import net.jami.Constants 1.1
-
-Popup {
-    id: root
-
-    width: emojiColumn.width + JamiTheme.emojiMargins
-    height: emojiColumn.height + JamiTheme.emojiMargins
-    padding: 0
-    background.visible: false
-
-    required property var emojiReactions
-    property var emojiReplied: emojiReactions.ownEmojis
-
-    required property string msgId
-    required property string msgBody
-    required property bool isOutgoing
-    required property int type
-    required property string transferName
-    required property Item msgBubble
-    required property ListView listView
-
-    property string transferId: msgId
-    property string location: msgBody
-    property bool closeWithoutAnimation: false
-    property var emojiPicker
-
-    focus: true
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
-
-    function xPositionProvider(width) {
-        // Use the width at function scope to retrigger property evaluation.
-        const listViewWidth = listView.width
-        if (isOutgoing) {
-            const leftMargin = msgBubble.mapToItem(listView, 0, 0).x
-            return width > leftMargin ? -leftMargin : -width
-        } else {
-            const rightMargin = listViewWidth - (msgBubble.x + msgBubble.width)
-            return width > rightMargin ? msgBubble.width - width : msgBubble.width
-        }
-    }
-    function yPositionProvider(height) {
-        const topOffset = msgBubble.mapToItem(listView, 0, 0).y
-        if (topOffset < 0) return -topOffset
-        const bottomOffset = topOffset + height - listView.height
-        if (bottomOffset > 0) return -bottomOffset
-        return 0
-    }
-    x: xPositionProvider(width)
-    y: yPositionProvider(height)
-
-    signal addMoreEmoji
-    onAddMoreEmoji: {
-        JamiQmlUtils.updateMessageBarButtonsPoints()
-        openEmojiPicker()
-    }
-
-    function openEmojiPicker() {
-        var component =  WITH_WEBENGINE ?
-                    Qt.createComponent("qrc:/webengine/emojipicker/EmojiPicker.qml") :
-                    Qt.createComponent("qrc:/nowebengine/EmojiPicker.qml")
-        emojiPicker = component.createObject(root.parent, { listView: listView })
-        emojiPicker.emojiIsPicked.connect(function(content) {
-            if (emojiReplied.includes(content)) {
-                MessagesAdapter.removeEmojiReaction(CurrentConversation.id, content, msgId)
-            } else {
-                MessagesAdapter.addEmojiReaction(CurrentConversation.id, content, msgId)
-            }
-        })
-        if (emojiPicker !== null) {
-            root.opacity = 0
-            emojiPicker.closed.connect(() => close())
-            emojiPicker.x = xPositionProvider(JamiTheme.emojiPickerWidth)
-            emojiPicker.y = yPositionProvider(JamiTheme.emojiPickerHeight)
-            emojiPicker.open()
-        } else {
-            console.log("Error creating emojiPicker from message options popup");
-        }
-    }
-
-    // Close the picker when listView vertical properties change.
-    property real listViewHeight: listView.height
-    onListViewHeightChanged: close()
-    property bool isScrolling: listView.verticalScrollBar.active
-    onIsScrollingChanged: close()
-
-    onOpened: root.closeWithoutAnimation = false
-    onClosed: if (emojiPicker) emojiPicker.closeEmojiPicker()
-
-    function getModel() {
-        const defaultModel = ["👍", "👎", "😂"]
-        const reactedEmojis = Array.isArray(emojiReplied) ? emojiReplied.slice(0, defaultModel.length) : []
-        const uniqueEmojis = Array.from(new Set(reactedEmojis))
-        const missingEmojis = defaultModel.filter(emoji => !uniqueEmojis.includes(emoji))
-        return uniqueEmojis.concat(missingEmojis)
-    }
-
-    Rectangle {
-        id: bubble
-
-        color: JamiTheme.chatviewBgColor
-        anchors.fill: parent
-        radius: JamiTheme.modalPopupRadius
-
-        ColumnLayout {
-            id: emojiColumn
-
-            anchors.centerIn: parent
-
-            RowLayout {
-                id: emojiRow
-                Layout.alignment: Qt.AlignCenter
-
-                Repeater {
-                    model: root.getModel()
-
-                    delegate: Button {
-                        id: emojiButton
-
-                        height: 50
-                        width: 50
-                        text: modelData
-                        font.pointSize: JamiTheme.emojiBubbleSize
-
-                        Text {
-                            visible: emojiButton.hovered
-                            anchors.centerIn: parent
-                            text: modelData
-                            font.pointSize: JamiTheme.emojiBubbleSizeBig
-                            z: 1
-                        }
-
-                        background: Rectangle {
-                            anchors.fill: parent
-                            opacity: emojiReplied ? (emojiReplied.includes(modelData) ? 1 : 0) : 0
-                            color: JamiTheme.emojiReactPushButtonColor
-                            radius: 10
-                        }
-
-                        onClicked: {
-                            if (emojiReplied.includes(modelData))
-                                MessagesAdapter.removeEmojiReaction(CurrentConversation.id,text,msgId)
-                            else
-                                MessagesAdapter.addEmojiReaction(CurrentConversation.id,text,msgId)
-                            close()
-                        }
-                    }
-                }
-                PushButton {
-                    toolTipText: JamiStrings.moreEmojis
-                    source: JamiResources.add_reaction_svg
-                    normalColor: JamiTheme.emojiReactBubbleBgColor
-                    imageColor: JamiTheme.emojiReactPushButtonColor
-                    visible: WITH_WEBENGINE
-                    onClicked: {
-                        root.closeWithoutAnimation = true
-                        root.addMoreEmoji()
-                        //close()
-                    }
-                }
-            }
-
-            Rectangle {
-                Layout.margins: 5
-                color: JamiTheme.timestampColor
-                Layout.fillWidth: true
-                Layout.preferredHeight: 1
-                radius: width * 0.5
-                opacity: 0.6
-            }
-
-            MessageOptionButton {
-                textButton: JamiStrings.copy
-                iconSource: JamiResources.copy_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    UtilsAdapter.setClipboardText(msgBody)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: type === Interaction.Type.DATA_TRANSFER
-                textButton: JamiStrings.saveFile
-                iconSource: JamiResources.save_file_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.copyToDownloads(root.transferId, root.transferName)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: type === Interaction.Type.DATA_TRANSFER
-                textButton: JamiStrings.openLocation
-                iconSource: JamiResources.round_folder_24dp_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.openDirectory(root.location)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: type === Interaction.Type.DATA_TRANSFER && Status === Interaction.Status.TRANSFER_FINISHED
-                textButton: JamiStrings.removeLocally
-                iconSource: JamiResources.trash_black_24dp_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.removeFile(msgId, root.location)
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                id: buttonEdit
-
-                visible: root.isOutgoing && type === Interaction.Type.TEXT
-                textButton: JamiStrings.editMessage
-                iconSource: JamiResources.edit_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-
-                onClicked: {
-                    MessagesAdapter.replyToId = ""
-                    MessagesAdapter.editId = root.msgId
-                    close()
-                }
-            }
-
-            MessageOptionButton {
-                visible: root.isOutgoing && type === Interaction.Type.TEXT
-                textButton: JamiStrings.deleteMessage
-                iconSource: JamiResources.delete_svg
-                Layout.fillWidth: true
-                Layout.margins: 5
-                onClicked: {
-                    MessagesAdapter.editMessage(CurrentConversation.id, "", root.msgId)
-                    close()
-                }
-            }
-        }
-    }
-
-    Overlay.modal: Rectangle {
-        color: JamiTheme.transparentColor
-        // Color animation for overlay when pop up is shown.
-        ColorAnimation on color {
-            to: JamiTheme.popupOverlayColor
-            duration: 500
-        }
-    }
-
-    DropShadow {
-        z: -1
-
-        width: bubble.width
-        height: bubble.height
-        horizontalOffset: 3.0
-        verticalOffset: 3.0
-        radius: bubble.radius * 4
-        color: JamiTheme.shadowColor
-        source: bubble
-        transparentBorder: true
-        samples: radius + 1
-    }
-
-    enter: Transition {
-        NumberAnimation {
-            properties: "opacity"; from: 0.0; to: 1.0
-            duration: JamiTheme.shortFadeDuration
-        }
-    }
-
-    exit: Transition {
-        NumberAnimation {
-            properties: "opacity"; from: 1.0; to: 0.0
-            duration: root.closeWithoutAnimation ? 0 : JamiTheme.shortFadeDuration
-        }
-    }
-}

src/app/commoncomponents/ModalTextEdit.qml

@@ -87,6 +87,7 @@ Loader {
 
         MaterialTextField {
             id: displayCompField
+
             font.pixelSize: root.fontPixelSize
             readOnly: root.readOnly
             text: elidedText != "" ? elidedText : staticText
@@ -94,6 +95,8 @@ Loader {
             isSwarmDetail: root.isSwarmDetail
             isSettings: root.isSettings
             textColor: root.textColor
+            suffixBisIconSrc: root.suffixBisIconSrc
+            suffixBisIconColor: root.suffixBisIconColor
             placeholderText: root.placeholderText
             prefixIconSrc: isSwarmDetail ? "" : root.prefixIconSrc
             prefixIconColor: root.prefixIconColor
@@ -122,6 +125,10 @@ Loader {
             echoMode: root.echoMode
             placeholderText: root.placeholderText
             onAccepted: root.accepted()
+            onRejected: {
+                root.editMode = false;
+                text = staticText;
+            }
             onKeyPressed: root.keyPressed()
             onTextChanged: dynamicText = text
             text: staticText

src/app/commoncomponents/PasswordDialog.qml

@@ -17,6 +17,7 @@
  */
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
 
@@ -24,6 +25,8 @@ import net.jami.Constants 1.1
 BaseModalDialog {
     id: root
 
+    closeButtonVisible: false
+
     enum PasswordEnteringPurpose {
         ChangePassword,
         ExportAccount,
@@ -64,26 +67,36 @@ BaseModalDialog {
                 "title": title,
                 "infoText": info,
                 "buttonTitles": [JamiStrings.optionOk],
-                "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue]
+                "buttonStyles": [SimpleMessageDialog.ButtonStyle.TintedBlue],
+                "buttonRoles": [DialogButtonBox.AcceptRole]
             });
         done(success, purpose);
     }
 
+    button1.text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
+    button1Role: DialogButtonBox.ApplyRole
+    button1.enabled: purpose === PasswordDialog.SetPassword
+
+    button2.text: JamiStrings.cancel
+    button2Role: DialogButtonBox.RejectRole
+    button2.onClicked: close()
+
     popupContent: ColumnLayout {
         id: popupContentColumnLayout
+        width: JamiTheme.preferredDialogWidth
 
         spacing: 16
 
         function validatePassword() {
             switch (purpose) {
             case PasswordDialog.ExportAccount:
-                btnConfirm.enabled = currentPasswordEdit.dynamicText.length > 0;
+                button1.enabled = currentPasswordEdit.dynamicText.length > 0;
                 break;
             case PasswordDialog.SetPassword:
-                btnConfirm.enabled = passwordEdit.dynamicText.length > 0 && passwordEdit.dynamicText === confirmPasswordEdit.dynamicText;
+                button1.enabled = passwordEdit.dynamicText.length > 0 && passwordEdit.dynamicText === confirmPasswordEdit.dynamicText;
                 break;
             default:
-                btnConfirm.enabled = currentPasswordEdit.dynamicText.length > 0 && passwordEdit.dynamicText === confirmPasswordEdit.dynamicText;
+                button1.enabled = currentPasswordEdit.dynamicText.length > 0 && passwordEdit.dynamicText === confirmPasswordEdit.dynamicText;
             }
         }
 
@@ -104,6 +117,13 @@ BaseModalDialog {
 
         onVisibleChanged: validatePassword()
 
+        Component.onCompleted: {
+            root.button1.clicked.connect(function() {
+                button1.enabled = false;
+                timerToOperate.restart();
+            });
+        }
+
         Timer {
             id: timerToOperate
 
@@ -123,10 +143,8 @@ BaseModalDialog {
             id: currentPasswordEdit
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: JamiTheme.preferredFieldWidth
+            Layout.fillWidth: true
             Layout.preferredHeight: visible ? 48 : 0
-            Layout.leftMargin: JamiTheme.preferredMarginSize
-            Layout.rightMargin: JamiTheme.preferredMarginSize
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.ExportAccount
             placeholderText: JamiStrings.enterCurrentPassword
@@ -138,10 +156,8 @@ BaseModalDialog {
             id: passwordEdit
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
-            Layout.leftMargin: JamiTheme.preferredMarginSize
-            Layout.rightMargin: JamiTheme.preferredMarginSize
+            Layout.fillWidth: true
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -154,10 +170,9 @@ BaseModalDialog {
             id: confirmPasswordEdit
 
             Layout.alignment: Qt.AlignHCenter
-            Layout.preferredWidth: JamiTheme.preferredFieldWidth
             Layout.preferredHeight: visible ? 48 : 0
-            Layout.leftMargin: JamiTheme.preferredMarginSize
-            Layout.rightMargin: JamiTheme.preferredMarginSize
+            Layout.bottomMargin: JamiTheme.preferredMarginSize
+            Layout.fillWidth: true
 
             visible: purpose === PasswordDialog.ChangePassword || purpose === PasswordDialog.SetPassword
 
@@ -165,26 +180,5 @@ BaseModalDialog {
 
             onDynamicTextChanged: popupContentColumnLayout.validatePassword()
         }
-
-        MaterialButton {
-            id: btnConfirm
-
-            Layout.alignment: Qt.AlignHCenter
-            preferredWidth: JamiTheme.preferredFieldWidth / 2 - 8
-
-            color: enabled ? JamiTheme.buttonTintedBlack : JamiTheme.buttonTintedGrey
-            hoveredColor: JamiTheme.buttonTintedBlackHovered
-            pressedColor: JamiTheme.buttonTintedBlackPressed
-            secondary: true
-            autoAccelerator: true
-            enabled: purpose === PasswordDialog.SetPassword
-
-            text: (purpose === PasswordDialog.ExportAccount) ? JamiStrings.exportAccount : JamiStrings.change
-
-            onClicked: {
-                btnConfirm.enabled = false;
-                timerToOperate.restart();
-            }
-        }
     }
 }