Add qt5-components page.

Also create an ENTITY for qt5 or qt5-alternate and use that to specify the qt5 dependenies. The complete KF5/plasma packages should use the full qt5 build, but the lxqt kf5/plasma components only need qt5-alternate.
2025-02-02 22:07:15 +08:00 · 2023-07-13 20:23:08 -05:00 · 2023-07-13 20:23:08 -05:00 · b3867c5f8c
commit b3867c5f8c
parent 32936bc2c2
39 changed files with 215 additions and 46 deletions
--- a/general.ent
+++ b/general.ent
@ -200,3 +200,6 @@ export -f as_root</userinput></screen>
 <!ENTITY logind
         "<phrase revision='sysv'><xref linkend='elogind'/></phrase>
          <phrase revision='systemd'><xref linkend='systemd'/></phrase>">
+
+<!ENTITY qt5-deps
+         "(<xref linkend='qt5'/> or <xref role='nodep' linkend='qt5-alternate'/>)">
--- a/general/genlib/libportal.xml
+++ b/general/genlib/libportal.xml
@ -77,7 +77,7 @@
    <para role="recommended">
      <xref linkend="gtk3"/>,
      <xref linkend="gtk4"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/general/genutils/graphviz.xml
+++ b/general/genutils/graphviz.xml
@ -144,7 +144,7 @@
      <ulink url="https://gts.sourceforge.net/">libGTS</ulink>, for building
      the <command>smyrna</command> large graph viewer, which is
      considered experimental), and
-      <xref linkend="qt5"/> (for building the <command>gvedit</command>
+      &qt5-deps; (for building the <command>gvedit</command>
      graph editor.)
    </para>

--- a/general/genutils/highlight.xml
+++ b/general/genutils/highlight.xml
@ -78,7 +78,7 @@
    <para role="optional">
      <!-- make apidocs fails because there is no Doxyfile
      <xref linkend="doxygen"/> (to build the API documentation) and -->
-      <xref linkend="qt5"/> (to build the GUI front-end)
+      &qt5-deps; (to build the GUI front-end)
    </para>

  </sect2>
--- a/general/genutils/pinentry.xml
+++ b/general/genutils/pinentry.xml
@ -93,7 +93,7 @@
      <!-- <xref linkend="libcap-pam"/>, This is in LFS already. PAM is not
      necessary. -->
      <xref linkend="libsecret"/>,
-      <xref linkend="qt5"/>, and
+      &qt5-deps;, and
      <ulink url="https://www.enlightenment.org/about-efl">efl</ulink>
    </para>

--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@ -144,7 +144,7 @@
      <xref linkend="gtk-doc"/>,
      <xref linkend="gtk3"/>,
      <xref linkend="libtiff"/>,
-      <xref linkend="qt5"/>
+      &qt5-deps;
      (required for PDF support in <xref role="nodep" linkend="okular5"/>), and
      <ulink url="https://download.qt.io/archive/qt/">Qt-6.1 or later</ulink>.

--- a/general/prog/cmake.xml
+++ b/general/prog/cmake.xml
@ -97,7 +97,7 @@
      <xref linkend="gcc"/> (for gfortran),
      <xref linkend="git"/> (for use during tests),
      <xref linkend="mercurial"/> (for use during tests),
-      <xref linkend="qt5"/> (for the Qt-based GUI),
+      &qt5-deps; (for the Qt-based GUI),
      <xref linkend="sphinx"/> (for building documents),
      <xref linkend="subversion"/> (for testing), and
      <ulink url="https://rhash.sourceforge.net/">rhash</ulink>
--- a/general/prog/doxygen.xml
+++ b/general/prog/doxygen.xml
@ -107,7 +107,7 @@
      <xref linkend="libxml2"/> (required for the tests),
      <xref linkend="llvm"/> (with clang),
      <!-- Can someone check this? With LLVM7, it fails to build. -->
-      <xref linkend="qt5"/> (for doxywizard),
+      &qt5-deps; (for doxywizard),
      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
      <xref linkend="xapian"/> (for doxyindexer), and
      <ulink url="https://javacc.github.io/javacc/">javacc</ulink>
--- a/lxqt/desktop/libfm-qt.xml
+++ b/lxqt/desktop/libfm-qt.xml
@ -73,7 +73,7 @@
      <xref linkend="cmake"/>,
      <xref linkend="libexif"/>,
      <xref linkend="menu-cache"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>
  </sect2>

--- a/lxqt/desktop/libqtxdg.xml
+++ b/lxqt/desktop/libqtxdg.xml
@ -71,7 +71,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="cmake"/> and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
--- a/lxqt/desktop/lxqt-build-tools.xml
+++ b/lxqt/desktop/lxqt-build-tools.xml
@ -72,7 +72,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="cmake"/> and
-      <xref linkend="qt5"/>  
+      &qt5-deps;
    </para>

    <para condition="html" role="usernotes">
--- a/lxqt/desktop/lxqt-kconfig.xml
+++ b/lxqt/desktop/lxqt-kconfig.xml
@ -79,7 +79,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

  </sect2>
--- a/lxqt/desktop/lxqt-kwayland.xml
+++ b/lxqt/desktop/lxqt-kwayland.xml
@ -82,7 +82,7 @@
      <xref linkend="extra-cmake-modules"/>,
      <xref linkend="mesa"/> (built with <xref linkend="wayland"/> support), 
      <xref linkend="plasma-wayland-protocols"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

  </sect2>
--- a/lxqt/desktop/lxqt-kwindowsystem.xml
+++ b/lxqt/desktop/lxqt-kwindowsystem.xml
@ -78,7 +78,7 @@
    <para role="required">
      <xref linkend="extra-cmake-modules"/>,
      <xref linkend="xorg7-lib"/>, and 
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <para condition="html" role="usernotes">
--- a/lxqt/desktop/lxqt-solid.xml
+++ b/lxqt/desktop/lxqt-solid.xml
@ -76,7 +76,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
--- a/multimedia/audioutils/audacious.xml
+++ b/multimedia/audioutils/audacious.xml
@ -109,7 +109,8 @@
    <para role="required">
      <xref role="nodep" linkend="gtk2"/> or
      <xref linkend="gtk3"/> or
-      <xref role="nodep" linkend="qt5"/> 
+      (<xref role="nodep" linkend="qt5"/> or 
+       <xref linkend="qt5-components"/> with qtimageformats)
    </para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
--- a/multimedia/libdriv/gst10-plugins-base.xml
+++ b/multimedia/libdriv/gst10-plugins-base.xml
@ -104,7 +104,7 @@
      <xref linkend="graphene"/>,
      <xref linkend="gtk3"/> (for examples),
      <xref linkend="opus"/>,
-      <xref linkend="qt5"/> (for examples),
+      &qt5-deps; (for examples),
      <xref linkend="sdl2"/>,
      <xref linkend="valgrind"/>,
      <ulink url="https://pypi.org/project/hotdoc">hotdoc</ulink>,
--- a/multimedia/libdriv/gst10-plugins-good.xml
+++ b/multimedia/libdriv/gst10-plugins-good.xml
@ -112,7 +112,7 @@
      <xref linkend="alsa-oss"/>,
      <xref linkend="gtk3"/> (for examples),
      <xref linkend="libdv"/>,
-      <xref linkend="qt5"/>,
+      &qt5-deps;,
      <xref linkend="speex"/>,
      <xref linkend="taglib"/>,
      <xref linkend="valgrind"/>,
--- a/multimedia/libdriv/mlt.xml
+++ b/multimedia/libdriv/mlt.xml
@ -74,7 +74,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para>
      <xref linkend='frei0r'/> and
-      <xref linkend='qt5'/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/multimedia/libdriv/v4l-utils.xml
+++ b/multimedia/libdriv/v4l-utils.xml
@ -89,7 +89,7 @@
      <xref linkend="alsa-lib"/>,
      <xref linkend="glu"/>,
      <xref linkend="libjpeg"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
@ -102,14 +102,7 @@

  <sect2 role="installation">
    <title>Installation of v4l-utils</title>
-<!--
-    <para>
-      First, apply a patch to fix building with GCC-11.1 if
-      <xref role="nodep" linkend="qt5"/> is installed:
-    </para>

-<screen><userinput remap="pre">patch -Np1 -i ../v4l-utils-&v4l-utils-version;-upstream_fixes-1.patch</userinput></screen>
-->
    <para>
      Install <application>v4l-utils</application> by running
      the following commands:
--- a/multimedia/videoutils/vlc.xml
+++ b/multimedia/videoutils/vlc.xml
@ -180,7 +180,7 @@

    <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
    <para role="optional">
-      <xref linkend="qt5"/> (required for the graphical user interface),
+      &qt5-deps; (required for the graphical user interface),
      <ulink url="https://repo.or.cz/w/libtar.git/">libtar</ulink>,
      <ulink url="https://libvnc.github.io/">libvncclient</ulink>,
      <ulink url="https://www.lirc.org/">LIRC</ulink>, and
--- a/networking/netlibs/kdsoup.xml
+++ b/networking/netlibs/kdsoup.xml
@ -72,7 +72,7 @@

    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

  </sect2>
--- a/networking/netprogs/wpa_supplicant.xml
+++ b/networking/netprogs/wpa_supplicant.xml
@ -90,7 +90,7 @@
    <para role="optional">
      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
      <xref linkend="libxml2"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>


@ -168,7 +168,7 @@ EOF</userinput></screen>
 make BINDIR=/usr/sbin LIBDIR=/usr/lib</userinput></screen>

    <para>
-      If you have installed <xref linkend="qt5"/> and wish to build
+      If you have installed &qt5-deps; and wish to build
      the <application>WPA Supplicant</application> GUI program, run
      the following commands:
    </para>
@ -176,7 +176,7 @@ make BINDIR=/usr/sbin LIBDIR=/usr/lib</userinput></screen>
    <note>
      <para>
        The following directory name is labelled qt4, but
-        is compatible with <xref linkend="qt5"/>.
+        is compatible with &qt5-deps;.
      </para>
    </note>

--- a/networking/netutils/avahi.xml
+++ b/networking/netutils/avahi.xml
@ -90,7 +90,7 @@
      <xref linkend="gtk3"/>,
      <xref linkend="libdaemon"/>,
      <xref linkend="libglade"/>, and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/networking/netutils/networkmanager.xml
+++ b/networking/netutils/networkmanager.xml
@ -115,7 +115,8 @@
      <xref linkend="gnutls"/> (can be used instead of <xref linkend="nss"/>),
      <xref linkend="gtk-doc"/>,
      <xref linkend="libpsl"/>,
-      <xref linkend="qt5"/> (for examples),
+      (<xref linkend="qt5"/> or 
+       <xref role="node" linkend="qt5-components"/> with qtdoc) (for examples),
      <xref linkend="ModemManager"/>,
      <xref linkend="valgrind"/>,
      <ulink url="https://thekelleys.org.uk/dnsmasq/doc.html">dnsmasq</ulink>,
--- a/networking/netutils/wireshark.xml
+++ b/networking/netutils/wireshark.xml
@ -102,7 +102,8 @@
      <xref linkend="cmake"/>,
      <xref linkend="glib2"/>,
      <xref linkend="libgcrypt"/>, and
-      <xref linkend="qt5"/>
+      (<xref linkend="qt5"/> or 
+       <xref role="nodep" linkend="qt5-components"/> with qtmultimedia)
    </para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
--- a/postlfs/security/gpgme.xml
+++ b/postlfs/security/gpgme.xml
@ -99,7 +99,7 @@
 gpgme can still use python 2.7, but can use python3 as well,
 so do not advertise python2
      <xref linkend="python2"/>,-->
-      <xref linkend="qt5"/>, and/or
+      &qt5-deps;, and/or
      <xref linkend="swig"/> (for language bindings)
    </para>

--- a/pst/typesetting/asymptote.xml
+++ b/pst/typesetting/asymptote.xml
@ -122,7 +122,7 @@
      <xref linkend="imagemagick"/> to convert output to other formats such as
      JPEG or to create animated GIFs,
      <ulink url="https://pypi.org/project/PyQt5/">PyQt5</ulink> (not tested,
-      has a build dependency of <xref linkend="qt5"/>) to use xasy.
+      has a build dependency of &qt5-deps;) to use xasy.
    </para>

    <para condition="html" role="usernotes">
--- a/x/dm/lightdm.xml
+++ b/x/dm/lightdm.xml
@ -146,7 +146,7 @@
      <xref role="runtime" linkend="accountsservice"/> (run time),
      <xref linkend="at-spi2-core"/>,
      <xref linkend="gtk-doc"/>,
-      <xref linkend="qt5"/>,
+      &qt5-deps;,
      <ulink url="https://launchpad.net/ido">libido</ulink>, and
      <ulink url="https://launchpad.net/libindicator">libindicator</ulink>

--- a/x/icons/breeze-icons.xml
+++ b/x/icons/breeze-icons.xml
@ -72,7 +72,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/x/icons/oxygen-icons5.xml
+++ b/x/icons/oxygen-icons5.xml
@ -71,7 +71,7 @@
    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>


--- a/x/lib/cairo.xml
+++ b/x/lib/cairo.xml
@ -108,7 +108,7 @@
      <xref linkend="lzo"/>,
      <xref linkend="mesa"/>,
      <xref linkend="poppler"/>,
-      <xref linkend="qt5"/>,
+      &qt5-deps;,
      <xref linkend="valgrind"/>,
      <ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,
      <ulink url="https://github.com/rillian/jbig2dec/">jbig2dec</ulink>,
--- a/x/lib/grantlee.xml
+++ b/x/lib/grantlee.xml
@ -75,7 +75,8 @@

    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
-      <xref linkend="cmake"/> and <xref linkend="qt5"/>
+      <xref linkend="cmake"/> and 
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
--- a/x/lib/kcolorpicker.xml
+++ b/x/lib/kcolorpicker.xml
@ -70,7 +70,8 @@

    <bridgehead renderas="sect4">Required</bridgehead>
    <para role="required">
-      <xref linkend="cmake"/> and <xref linkend="qt5"/>
+      <xref linkend="cmake"/> and 
+      &qt5-deps;
    </para>


--- a/x/lib/lib.xml
+++ b/x/lib/lib.xml
@ -73,6 +73,7 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/> -->
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-alternate.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-components.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
  <!--
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->
--- a/x/lib/qt5-components.xml
+++ b/x/lib/qt5-components.xml
@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY qt5-major "5.15">
+  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
+
+  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
+  <!ENTITY qt5-download-ftp  " ">
+  <!ENTITY qt5-md5sum        "fb41d86bea6bc4886030a5092c910b09">
+  <!ENTITY qt5-size          "varies">
+  <!ENTITY qt5-buildsize     "varies">
+  <!ENTITY qt5-time          "varies">
+]>
+
+<sect1 id="qt5-components" xreflabel="qt-components-&qt5-version;">
+  <?dbhtml filename="qt5-components.html" ?>
+
+  <title>qt-components-&qt5-version;</title>
+
+  <indexterm zone="qt5-components">
+    <primary sortas="a-Qt-components">Qt Components</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to qt5 comonents</title>
+
+    <para>
+      These instructions show how to build additional Qt5 components beyond
+      <xref linkend="qt5-alternate"/>.  They are not applicable if the 
+      full <xref linkend="qt5"/> package has been built.
+    </para>
+
+    &lfs113_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qt5-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qt5-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qt5-md5sum;
+        </para>
+      </listitem>
+<!--
+      <listitem>
+        <para>
+          Download size: &qt5-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qt5-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qt5-time;
+        </para>
+      </listitem>
+-->
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">qt5 components Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="qt5-alternate"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended dependencies for qtimageformats</bridgehead>
+    <para role="recommended">
+      <xref linkend="jasper"/>,
+      <xref linkend="libmng"/>, and
+      <xref linkend="libwebp"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended dependencies for multimedia</bridgehead>
+    <para role="recommended">
+      <xref linkend="gst10-plugins-good"/>,
+      <xref linkend="gst10-plugins-bad"/>, and
+      <xref linkend="gst10-plugins-ugly"/>
+    </para>
+
+    <!--
+    <para condition="html" role="usernotes">
+       Editor Notes: <ulink url="&blfs-wiki;/qt5"/>
+    </para>
+    -->
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of qt5 components</title>
+
+    <para>
+      There are a few extra components needed for different packages in BLFS.
+      These are qtimageformats, qtlocation, qtwebchannel, qtdoc, and
+      qtmultimedia. Only those components specified for a specific 
+      package are needed. You only need to build the relevant component(s). 
+    </para>
+
+    <para>
+      Install each desired component by running the following commands:
+    </para>
+
+<screen><userinput role="nodep">cd &lt;component&gt;
+qmake &lt;component&gt;.pro
+make</userinput></screen>
+
+    <para>
+      As the &root; user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
+         installing in a temporary directory. -->
+
+    <para>
+      Remove references to the build directory from installed library
+      dependency (prl) files by running the following
+      command as the &root; user:
+    </para>
+
+<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
+   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
+
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libQt5&lt;component&gt;.so,
+        </seg>
+        <seg>
+          $QTDIR/qml/&lt;component&gt;
+          $QTDIR/lib/&lt;component&gt;
+          $QTDIR/include/&lt;component&gt;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
--- a/x/lib/qtwebengine.xml
+++ b/x/lib/qtwebengine.xml
@ -271,7 +271,8 @@
      <xref linkend="nss"/>,
      <xref linkend="pciutils"/>, and
 <!--  <xref linkend="python2"/>, and -->
-      <xref linkend='qt5'/>
+      (<xref linkend='qt5'/> or 
+       <xref role="nodep" linkend='qt5-components'/> with qtlocation and qtwebchannel)
    </para>

    <bridgehead renderas="sect4">Recommended</bridgehead>
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@ -794,7 +794,7 @@ fi</userinput></screen>
    <para>
      <!-- Brings in - -enable-qt5 as well. -->
      <option>--enable-kf5</option>: Builds with KDE/Plasma integration. If
-      <xref linkend="qt5"/> and/or <xref linkend="kf5-frameworks"/> are not
+      &qt5-deps; and/or <xref linkend="kf5-frameworks"/> are not
      installed in <filename class="directory">/usr</filename>, the include
      and library directories must be specified in <envar>QT5INC</envar>,
      <envar>QT5LIB</envar>, <envar>KF5INC</envar>, and <envar>KF5LIB</envar>,
--- a/xsoft/other/transmission.xml
+++ b/xsoft/other/transmission.xml
@ -86,7 +86,7 @@
    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
    <para role="recommended">
      <xref linkend="gtkmm3"/> or
-      <xref linkend="qt5"/>
+      &qt5-deps;
    </para>

    <bridgehead renderas="sect4">Optional</bridgehead>
@ -147,7 +147,7 @@ make</userinput></screen>
    <para>
      <option>-DENABLE_QT=OFF</option>: This switch disables building
      the <application>Qt5</application> client. The default is to build it
-      if <xref linkend="qt5"/> is installed.
+      if &qt5-deps; is installed.
    </para>

    <para>