From ef0569b0c83a3117d5742a89ccb83fc3d54b58f0 Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Thu, 4 Aug 2022 12:40:55 -0400 Subject: [PATCH] 3rdparty: add SortFilterProxyModel QML helper Can be used directly in QML without having to derive from QSortFilterProxyModel and manage source model settings from C++ code. Change-Id: Icac1f6dadfc0d1f64b4459ae0cdbebdd30b79b3e --- .gitmodules | 10 +++++++--- 3rdparty/SortFilterProxyModel | 1 + INSTALL.md | 12 +++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 160000 3rdparty/SortFilterProxyModel diff --git a/.gitmodules b/.gitmodules index 2cb2b72ee..59b1ae786 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,6 +3,10 @@ url = https://github.com/BlueDragon747/qrencode-win32.git ignore = dirty [submodule "sparkle/Sparkle"] - path = sparkle/Sparkle - url = https://github.com/sparkle-project/Sparkle.git - ignore = dirty + path = sparkle/Sparkle + url = https://github.com/sparkle-project/Sparkle.git + ignore = dirty +[submodule "3rdparty/SortFilterProxyModel"] + path = 3rdparty/SortFilterProxyModel + url = https://github.com/atraczyk/SortFilterProxyModel.git + ignore = dirty diff --git a/3rdparty/SortFilterProxyModel b/3rdparty/SortFilterProxyModel new file mode 160000 index 000000000..ccc469062 --- /dev/null +++ b/3rdparty/SortFilterProxyModel @@ -0,0 +1 @@ +Subproject commit ccc4690624709d558293aa08cb45e8edf30f73b4 diff --git a/INSTALL.md b/INSTALL.md index 3c1db9764..c30688392 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -94,10 +94,20 @@ Notes: ## Build only the client -In order to use the Qt Client it is necessary to have the Qt version 5.14 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.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). ## Build only this repository +Clone with common required submodule (platform specific submodules will be cloned during the configure step) + +```bash +git clone https://review.jami.net/jami-client-qt +cd jami-client-qt +git submodule update --recursive --init +``` + +Use CMake to build + ```bash # In this repository mkdir build -- GitLab