Upstream-status: https://lists.gnu.org/archive/html/jami/2024-03/msg00008.html

This makes it possible to use the system-provided qwindowkit library.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d2dccfb..8dedff50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,13 +100,13 @@ endif()
 
 # qwindowkit (frameless window)
 add_fetch_content(
-  TARGET qwindowkit
+  TARGET QWindowKit
   URL https://github.com/stdware/qwindowkit.git
   BRANCH 79b1f3110754f9c21af2d7dacbd07b1a9dbaf6ef
   PATCHES ${QWINDOWKIT_PATCHES}
   OPTIONS ${QWINDOWKIT_OPTIONS}
 )
-list(APPEND CLIENT_INCLUDE_DIRS ${QWindowKit_BINARY_DIR}/include)
+
 list(APPEND CLIENT_LIBS QWindowKit::Quick)
 
 set(CMAKE_AUTOMOC ON)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b2730b71..4960899e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,7 +48,7 @@ target_include_directories(test_common_obj PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/src)
 target_link_directories(test_common_obj PRIVATE ${CLIENT_LINK_DIRS})
-target_link_libraries(test_common_obj ${QML_TEST_LIBS})
+target_link_libraries(test_common_obj ${QML_TEST_LIBS} ${CLIENT_LIBS})
 target_compile_definitions(test_common_obj PRIVATE BUILD_TESTING="ON")
 
 set(COMMON_TESTS_SOURCES
91bd5cc30849ee286e2ae03c98'>tree</a><a href='/guix/commit/build-aux/cuirass?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98'>commit</a><a href='/guix/diff/build-aux/cuirass?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/cuirass'>
<input type='hidden' name='id' value='dc889e85a98ee891bd5cc30849ee286e2ae03c98'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98'>root</a>/<a href='/guix/log/build-aux?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98'>build-aux</a>/<a href='/guix/log/build-aux/cuirass?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98'>cuirass</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/cuirass?id=dc889e85a98ee891bd5cc30849ee286e2ae03c98&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-05-26 11:41:05 +0200'>2022-05-26</span></td><td><a href='/guix/commit/build-aux/cuirass?id=d90bd5642a3663cc7d5124068fadbf8fa28b3207'>cuirass: Create just as many threads as needed.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/cuirass/evaluate.scm (command-line): Change second argument
to 'n-par-for-each'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-26 11:41:05 +0200'>2022-05-26</span></td><td><a href='/guix/commit/build-aux/cuirass?id=98a6642298be6663b9d318b7dea46d1dba275839'>cuirass: Fork inferior processes before creating threads.</a><span class='msg-avail'>...<span class='msg-tooltip'>Works around &lt;https://issues.guix.gnu.org/55441#12&gt;.

Start from commit bd86bbd300474204878e927f6cd3f0defa1662a5,
'open-inferior' uses 'primitive-fork' instead of 'open-pipe*'.  As a
result, child process could potentially hang before calling 'execl' due
to undefined behavior when forking a multi-threaded process.

* build-aux/cuirass/evaluate.scm &lt;top level&gt;: Call 'open-inferior'
before 'n-par-for-each'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-05-20 18:46:07 +0200'>2022-05-20</span></td><td><a href='/guix/commit/build-aux/cuirass?id=598f7289db9955584457ffc11c8504f3938a1618'>cuirass: Close each inferior upon completion.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/cuirass/evaluate.scm &lt;top level&gt;: Add 'close-inferior' call.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-03-10 08:49:48 +0100'>2021-03-10</span></td><td><a href='/guix/commit/build-aux/cuirass?id=76bea3f8bcd951ded88dfb7f8cad5bc3e5a1701f'>ci: Remove hydra support.</a><span class='msg-avail'>...<span class='msg-tooltip'>This removes hydra support to use Cuirass as the only continuous integration
system.

* build-aux/hydra/gnu-system.scm: Remove it.
* build-aux/hydra/guix-modular.scm: Ditto.
* build-aux/hydra/guix.scm: Ditto.
* build-aux/cuirass/hydra-to-cuirass.scm: Ditto.
* Makefile.am (EXTRA_DIST): Update it.
(hydra-jobs.scm): Remove it.
(cuirass-jobs.scm): Update it.
* build-aux/hydra/evaluate.scm: Move it to ...
* build-aux/cuirass/evaluate.scm: ... here.
* build-aux/cuirass/guix-modular.scm: Remove it.
* build-aux/cuirass/gnu-system.scm: Ditto.
* guix/packages.scm (%hydra-supported-systems): Rename it to ...
(%cuirass-supported-systems): ... this variable.
* build-aux/check-final-inputs-self-contained: Adapt it.
* etc/release-manifest.scm: Ditto.
* gnu/ci.scm (package-&gt;alist): Remove it.
(derivation-&gt;job): New procedure.
(package-job, package-cross-job, cross-jobs, image-jobs, system-test-jobs,
tarball-jobs): Use it.
(guix-jobs): New procedure.
(hydra-jobs): Rename it to ...
(cuirass-jobs): ... this procedure.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-10-04 14:04:14 +0200'>2020-10-04</span></td><td><a href='/guix/commit/build-aux/cuirass?id=fdbf8a7a75e9d63957ea6d8a63181aa131edeaea'>cuirass: Add hurd-manifest.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/cuirass/hurd-manifest.scm: New file.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>