diff --git a/CMakeLists.txt b/CMakeLists.txt index bf3132e709aa7784af9616868d5fcb57b44fcd29..b0df81d12839eabd78d0d6d1a63c883bb4f66586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,8 +81,8 @@ else() find_package(QT NAMES Qt6 REQUIRED) endif() if (${QT_VERSION_MAJOR} STRLESS 6) - if (${QT_VERSION_MINOR} STRLESS 2) - message(FATAL_ERROR "Qt 6.2 or higher is required.") + if (${QT_VERSION_MINOR} STRLESS 4) + message(FATAL_ERROR "Qt 6.4 or higher is required.") endif() endif() diff --git a/INSTALL.md b/INSTALL.md index e2bca07582b8ecedf1de76f40be49e4f455a8f78..1f27c9081461b2da5599a820c62dfc5e0af2951c 100644 --- a/INSTALL.md +++ b/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.2 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.4 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.2 first. For this, there is 3 methods: +So, you will need to get Qt 6.4 first. For this, there is 3 methods: ### Qt from https://jami.net (recommended) @@ -43,7 +43,7 @@ sudo dnf update && sudo dnf install jami-libqt ### Qt from your distribution -If Qt 6.2 is available, you can use the packages from your distribution: +If Qt 6.4 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). @@ -107,7 +107,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.2.1/gcc_64`. +`./build.py --install --qt=/home/<username>/Qt/6.4.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: @@ -123,7 +123,7 @@ Notes: ## Build only the client -In order to use the Qt Client it is necessary to have the Qt version 6.2 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.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). ## Build only this repository @@ -173,7 +173,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.2.3 components: +- Using the online installer, install the following Qt 6.4.3 components: - Git 2.10.2 - MSVC 2019 64-bit @@ -196,7 +196,7 @@ Only 64-bit MSVC build can be compiled. | | Qt Version | | -------------------- | ---------- | - | Minimum requirement: | 6.2.3 | + | Minimum requirement: | 6.4.3 | - Install [Python3](https://www.python.org/downloads/) for Windows @@ -222,7 +222,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.2.3/msvc2019_64) + python build.py --install --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64) ``` > **SDK** Note: @@ -265,7 +265,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.2.3/msvc2019_64) + python extras\scripts\build-windows.py --qt <path-to-qt-bin-folder> (e.g. C:/Qt/6.4.3/msvc2019_64) ``` ## Building On MacOS @@ -275,9 +275,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.2 +- install Qt 6.4 -Qt 6.2 can be installed via brew +Qt 6.4 can be installed via brew ```bash brew install qt diff --git a/extras/packaging/gnu-linux/rules/debian/control b/extras/packaging/gnu-linux/rules/debian/control index 1b99d2f368b174d000c524be3e2386a970ae812b..135a51da0d1b6214c45576653ee833e9ab62eb4a 100644 --- a/extras/packaging/gnu-linux/rules/debian/control +++ b/extras/packaging/gnu-linux/rules/debian/control @@ -68,7 +68,7 @@ Depends: gnupg, Replaces: jami, jami-libclient, jami-daemon, - libqt-jami (>= 6.2.3), + libqt-jami (>= 6.4.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.2.3) + libqt-jami (>= 6.4.3) Provides: jami-qt Replaces: jami-all, jami-libclient (<= 20220516.0214.9b42ad3~dfsg1-1) diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec index 06907041060b9bf51b66f94038b1647c08c7f5b8..4e0a68d41afaa10d238576a415c6445ec457e37c 100644 --- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec +++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec @@ -65,7 +65,7 @@ This package contains Qt libraries for Jami. %build echo "Building Qt using %{job_count} parallel jobs" -# Qt 6.2 (https://wiki.linuxfromscratch.org/blfs/ticket/14729) +# Qt 6.4 (https://wiki.linuxfromscratch.org/blfs/ticket/14729) sed -i 's,default=False,default=True,g' qtwebengine/src/3rdparty/chromium/third_party/catapult/tracing/tracing_build/generate_about_tracing_contents.py # Gcc 13 sed -i 's,std::uint32_t,uint32_t,g' qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp diff --git a/extras/scripts/build-windows.py b/extras/scripts/build-windows.py index 5ba8ae05962289ca940aa9683dff5f3bf01d50ac..d37f745c98a11e7548051d608137042e13521739 100644 --- a/extras/scripts/build-windows.py +++ b/extras/scripts/build-windows.py @@ -27,7 +27,7 @@ mutually exclusive required arguments: -z, --zip Build portable archive examples: -1. build.py --qt=C:/Qt/6.2.3/msvc2019_64 # Build the app using a specific Qt +1. build.py --qt=C:/Qt/6.4.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 diff --git a/extras/scripts/install.sh b/extras/scripts/install.sh index 32bab2fbe8219bfad7519379e2149a98b4b6d6e5..1ca7038812d7c1cad42e91d04594f9101ec1a599 100755 --- a/extras/scripts/install.sh +++ b/extras/scripts/install.sh @@ -33,7 +33,7 @@ export OSTYPE set -ex # Qt_MIN_VER required for client-qt -QT_MIN_VER="6.2" +QT_MIN_VER="6.4" debug= global=false diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt index 144efaf50fd81a5d1a3ac79fadcfe62ce65e0366..eee5d0dfe7f2fccd63479ec46b6c0d3cbc6b7084 100644 --- a/src/libclient/CMakeLists.txt +++ b/src/libclient/CMakeLists.txt @@ -193,8 +193,8 @@ else() find_package(QT NAMES Qt6 REQUIRED) endif() if (${QT_VERSION_MAJOR} STRLESS 6) - if (${QT_VERSION_MINOR} STRLESS 2) - message(FATAL_ERROR "Qt 6.2 or higher is required.") + if (${QT_VERSION_MINOR} STRLESS 4) + message(FATAL_ERROR "Qt 6.4 or higher is required.") endif() endif()