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
s/kerberos.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>tree</a><a href='/guix/commit/gnu/packages/kerberos.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>commit</a><a href='/guix/diff/gnu/packages/kerberos.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/kerberos.scm'>
<input type='hidden' name='id' value='85ba5e9335207beef9a650e96d5d64787beb9256'/><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=85ba5e9335207beef9a650e96d5d64787beb9256'>root</a>/<a href='/guix/log/gnu?id=85ba5e9335207beef9a650e96d5d64787beb9256'>gnu</a>/<a href='/guix/log/gnu/packages?id=85ba5e9335207beef9a650e96d5d64787beb9256'>packages</a>/<a href='/guix/log/gnu/packages/kerberos.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256'>kerberos.scm</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/gnu/packages/kerberos.scm?id=85ba5e9335207beef9a650e96d5d64787beb9256&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-16 14:52:18 -0400'>2020-05-16</span></td><td><a href='/guix/commit/gnu/packages/kerberos.scm?id=5c4aa84e4ab891ae2cfc10b8601113887550c070'>gnu: heimdal: Update to 7.7.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>And fix the test suite failures as a side effect.

* gnu/packages/kerberos.scm (heimdal): Update to 7.7.0.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-03-26 12:59:35 +0100'>2020-03-26</span></td><td><a href='/guix/commit/gnu/packages/kerberos.scm?id=770ea94c9cde701ae3b45f313799b9d95154c267'>gnu: mit-krb5: Supprt for the Hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/mit-krb5-hurd.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/kerberos.scm (mit-krb5): Use it.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
<tr><td><span title='2020-03-14 12:02:53 +0100'>2020-03-14</span></td><td><a href='/guix/commit/gnu/packages/kerberos.scm?id=e59d958a9c9a509ce34ca553a5b1b03e406d561f'>gnu: mit-krb5: Fix segfault in gsasl test suite.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/mit-krb5-qualify-short-hostnames.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/kerberos.scm (mit-krb5)[source](patches): New field.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-10 20:50:02 +0100'>2020-03-10</span></td><td><a href='/guix/commit/gnu/packages/kerberos.scm?id=50b99c90c87642f664f9c9523a6e40fc8542ddcf'>Merge branch 'master' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-03-09 16:01:18 +0100'>2020-03-09</span></td><td><a href='/guix/commit/gnu/packages/kerberos.scm?id=a0087cf58d1172bcb9267d349bfc8497721bc15d'>gnu: mit-krb5: Use HTTPS home page.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/kerberos.scm (mit-krb5)[home-page]: Use HTTPS.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>