Changeset ad8b716

Timestamp:

07/17/2024 10:35:20 PM (6 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

gimp3, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128

Children:

c2c16bab

Parents:

cbfa153

Message:

onsolidate qt5 pages.

Remove the page for a full qt5 install.
Remove qt5-components

Rename qt5-alternate to qt5-components adding instructions to optionally
add qtdoc and qtmultimedia to the build.

Files:

• general.ent (modified) (1 diff)
• general/genlib/libical.xml (modified) (1 diff)
• networking/netutils/networkmanager.xml (modified) (2 diffs)
• networking/netutils/wireshark.xml (modified) (2 diffs)
• x/lib/lib.xml (modified) (1 diff)
• x/lib/qt5-alternate.xml (deleted)
• x/lib/qt5-components-old.xml (added)
• x/lib/qt5-components.xml (modified) (9 diffs)

general.ent

@@ -203 +203 @@
           <phrase revision='systemd'><xref linkend='systemd'/></phrase>">
 
-<!ENTITY qt5-deps
-         "(<xref linkend='qt5'/> or <xref role='nodep' linkend='qt5-alternate'/>)">
+<!--<!ENTITY qt5-deps
+         "(<xref linkend='qt5'/> or <xref role='nodep' linkend='qt5-alternate'/>)">-->
+
+<!ENTITY qt5-deps "<xref linkend='qt5-components'/>">
 
 <!ENTITY build-wheel-cmd "pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir">

general/genlib/libical.xml

@@ -103 +103 @@
     </para>
 
-    <screen><userinput>sed '/getKeywordValuesForLocale/s/NULL/""/' \
-    -i ../src/libical/icalrecur.c</userinput></screen>
+    <screen><userinput>sed -i '/getKeywordValuesForLocale/s/NULL/""/' src/libical/icalrecur.c</userinput></screen>
 
     <para>

networking/netutils/networkmanager.xml

@@ -113 +113 @@
       <xref linkend="jansson"/>,
       <xref linkend="ModemManager"/>,
-      (<xref linkend="qt5"/> or
-       <xref role="node" linkend="qt5-components"/> with qtdoc) (for examples),
+      <xref linkend="qt5-components"/> with qtdoc) (for examples),
       <xref linkend="upower"/>,
       <xref linkend="valgrind"/>,
@@ -163 +162 @@
 
     <para>
-      If <xref linkend="qt5"/> is installed and the Qt based
+      If <xref linkend="qt5-components"/> is installed and the Qt based
       examples are desired, fix two meson.build files:
     </para>

networking/netutils/wireshark.xml

@@ -142 +142 @@
       <xref linkend="mitkrb"/>,
       <xref linkend="nghttp2"/>,
-      (<xref linkend="qt5"/> or
-      <xref role="nodep" linkend="qt5-components"/> with qtmultimedia)
+      <xref linkend="qt5-components"/> with qtmultimedia
       (required if <xref role="nodep" linkend="qt6"/> is not installed),
       <xref linkend="sbc"/>,
@@ -271 +270 @@
         <option>-D USE_qt6=OFF</option>: Use this switch if
         <xref linkend="qt6"/> is not available. You'll need
-        <xref linkend="qt5"/> or at least <xref linkend="qt5-components"/>
-        with qtmultimedia in this case.
+        <xref linkend="qt5-components"/> with qtmultimedia.
       </para>
 <!--

x/lib/lib.xml

@@ -78 +78 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm2.xml"/>
 <!--  <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.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="qt6.xml"/>

x/lib/qt5-components.xml

@@ -12 +12 @@
   <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
   <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "varies">
-  <!ENTITY qt5-time          "varies">
+  <!ENTITY qt5-buildsize     "8.5 GB (154 MB installed)">
+  <!ENTITY qt5-time          "7.4 SBU (using parallelism=4)">
 ]>
 
@@ -22 +22 @@
 
   <indexterm zone="qt5-components">
-    <primary sortas="a-Qt5-components">Qt Components</primary>
+    <primary sortas="a-Qt5-">Qt Components</primary>
   </indexterm>
 
@@ -29 +29 @@
 
     <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>
+      <application>Qt5</application> is a cross-platform application framework
+      that is widely used for developing application software with a graphical
+      user interface (GUI) (in which cases <application>qt5</application> is
+      classified as a widget toolkit), and also used for developing non-GUI
+      programs such as command-line tools and consoles for servers. Two of the
+      major users of <application>qt</application> are <application>KDE
+      Frameworks 5 (KF5)</application> and <application>LXQt</application>.
+    </para>
+
+    <important>
+      <para>
+         The full <application>qt5</application> package consists of 43 separate
+         components. These instructions use a small subset of the full
+         <application>qt5</application> installation instructions.
+         They cover the components needed to build
+         packages in BLFS. 
+      </para>
+    </important>
 
     &lfs121_checked;
@@ -58 +72 @@
         </para>
       </listitem>
-<!--
       <listitem>
         <para>
@@ -69 +82 @@
         </para>
       </listitem>
--->
     </itemizedlist>
 
@@ -92 +104 @@
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">qt5 components Dependencies</bridgehead>
+    <bridgehead renderas="sect3">qt5 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="qt5-alternate"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtimageformats</bridgehead>
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="jasper"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="libwebp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtmultimedia</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-good"/>,
-      <xref linkend="gst10-plugins-bad"/>, and
-      <xref linkend="gst10-plugins-ugly"/>
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="at-spi2-core"/>,
+      <xref linkend="cups"/>,
+      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
+      <xref linkend="double-conversion"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="mesa"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libxkbcommon"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="wayland"/> (<application>Mesa</application>
+      must be built with <application>Wayland</application> EGL
+      backend),
+      <xref linkend="xcb-util-image"/>,
+      <xref linkend="xcb-util-keysyms"/>,
+      <xref linkend="xcb-util-renderutil"/>, and
+      <xref linkend="xcb-util-wm"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk3"/>,
+      <xref linkend="libinput"/>
+      <xref linkend="mariadb"/>
+        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="mtdev"/>
+      <xref linkend="postgresql"/>, and
+      <xref linkend="unixodbc"/>
     </para>
 
   </sect2>
 
+  <sect2 role="qt5-prefix">
+    <title>Setting the installation prefix</title>
+
+    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
+
+    <para>
+      The BLFS editors recommend installing <application>qt5</application> in a
+      directory other than <filename class="directory">/usr</filename>, i.e.
+      <filename class="directory">/opt/qt5</filename>.  To do this, set the
+      following environment variable:
+    </para>
+
+<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
+
+    <tip>
+      <para>
+        Sometimes, the installation paths are hardcoded into installed files.
+        This is the reason why <filename class="directory">/opt/qt5</filename>
+        is used as installation prefix instead of <filename
+        class="directory">/opt/qt-&qt5-version;</filename>. To create a
+        versioned <application>qt5</application> directory after the
+        installation is complete, you may rename the directory and create a symlink:
+      </para>
+
+<screen role="root"><userinput>mkdir -pv /opt/qt-&qt5-version;
+ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
+
+      <para>
+        Later on, you may want to install other versions of
+        <application>qt5</application>. To do that, just remove the symlink
+        and use <filename class="directory">/opt/qt5</filename> as the
+        prefix again. Which version of <application>qt5</application> you
+        use depends only on where the symlink points.
+      </para>
+    </tip>
+
+  </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
-      <emphasis role="bold">qtimageformats</emphasis>,
-      <emphasis role="bold">qtwebchannel</emphasis>,
-      <emphasis role="bold">qtdoc</emphasis>, and
-      <emphasis role="bold">qtmultimedia</emphasis>.
-      Only those components specified for a specific
-      package are needed. You only need to build the relevant component(s).
-    </para>
-
-    <para>
-      First, apply a patch to pull in the fixes curated by KDE for some of the
-      modules listed above:
+    <title>Installation of qt5</title>
+
+    <warning>
+      <para>
+        If <application>qt5</application> is being reinstalled into the
+        same directory as an existing instance, run the commands done by
+        &root;, such as
+        <command>make install</command>, from a console or non-qt5 based
+        window manager. It overwrites <application>qt5</application>
+        libraries that should not be in use during the install process.
+      </para>
+    </warning>
+
+    <caution>
+      <para>
+        If you did not install some of the recommended dependencies, examine
+        <command>./configure --help</command> output to check how to disable
+        them or use internal versions bundled in the source tarball.
+      </para>
+    </caution>
+
+    <note>
+      <para>
+        The BLFS editors do not recommend installing
+        <application>qt5</application> into the
+        <filename class="directory">/usr</filename> hierarchy because it
+        becomes difficult to find components and to update to a new version.
+        If you do want to install <application>qt5</application> in
+        <filename class="directory">/usr</filename>, the directories need to
+        be specified explicitly.  In this case, set
+        <envar>QT5PREFIX=/usr</envar> and add the following to the configure
+        arguments below:
+      </para>
+
+<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
+            -bindir         /usr/bin                    \
+            -plugindir      /usr/lib/qt5/plugins        \
+            -importdir      /usr/lib/qt5/imports        \
+            -headerdir      /usr/include/qt5            \
+            -datadir        /usr/share/qt5              \
+            -docdir         /usr/share/doc/qt5          \
+            -translationdir /usr/share/qt5/translations \
+            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
+    </note>
+
+    <para>
+      Now apply a patch to pull in the fixes curated by kde for those
+      modules which are required by packages mentioned in this book:
     </para>
 
@@ -140 +249 @@
 
     <para>
-      Install each desired component by running the following commands:
-    </para>
-
-<screen><userinput>cd <replaceable>&lt;component&gt;</replaceable>
-qmake <replaceable>&lt;component&gt;</replaceable>.pro
+      The patch is supposed to be used in a git repository. Otherwise some
+      files that should be modified by <command>configure</command> after
+      applying the patch are not touched. Fortunately, it is enough to create a
+      <filename class="directory">.git</filename> directory in the
+      <filename class="directory">qmake</filename> directory where the
+      <command>configure</command> script is run:
+    </para>
+
+    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
+
+    <para>
+      Fix a security vulnerability in qtbase:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch</userinput></screen>
+
+    <para>
+      At this point we want to set up skipping most components.  Do that with:
+    </para>
+
+<screen><userinput>ls -Fd qt* | grep / | sed 's/^/-skip /;s@/@@' > tempconf &amp;&amp;
+sed -i -r '/base|tools|x11extras|svg|declarative|wayland/d' tempconf</userinput></screen>
+
+    <para>
+      If you want to install the <xref linkend='NetworkManager'/> examples, run:
+      <command>sed -i '/qtdoc/d' tempconf</command>.
+    </para>
+
+    <para>
+      If you choose to not install <xref linkend='qt6'/> and want to use qt5 with 
+      wireshark, run: <command>sed -i '/qtmultimedia/d' tempconf</command>.
+    </para>
+
+    <para>
+      Now, install <application>qt5</application> by running the following
+      commands:
+    </para>
+
+<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX   \
+            -sysconfdir /etc/xdg \
+            -confirm-license     \
+            -opensource          \
+            -dbus-linked         \
+            -openssl-linked      \
+            -system-harfbuzz     \
+            -system-sqlite       \
+            -nomake examples     \
+            -no-rpath            \
+            -syslog              \
+            $(cat tempconf)      \
+            &amp;&amp;
 make</userinput></screen>
 
-    <para>
-      As the &root; user:
+<screen revision="systemd"><userinput>./configure -prefix $QT5PREFIX   \
+            -sysconfdir /etc/xdg \
+            -confirm-license     \
+            -opensource          \
+            -dbus-linked         \
+            -openssl-linked      \
+            -system-harfbuzz     \
+            -system-sqlite       \
+            -nomake examples     \
+            -no-rpath            \
+            -journald            \
+            $(cat tempconf)      \
+            &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -159 +333 @@
       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 \
+      command as &root; user:
+    </para>
+
+<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
 
+    <para>
+      Install images and create the menu entries for installed applications.
+      The <envar>QT5BINDIR</envar> variable is used here to point to the
+      directory for the executable programs.  If you have changed the bindir
+      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
+      that the <envar>QT5BINDIR</envar> variable is defined in root's
+      environment and as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
+
+install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
+
+install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
+                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
+
+install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
+                  /usr/share/pixmaps/designer-qt5.png  &amp;&amp;
+
+install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
+                  /usr/share/pixmaps/linguist-qt5.png  &amp;&amp;
+
+install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
+
+install -dm755 /usr/share/applications &amp;&amp;
+
+cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt5 Assistant
+Comment=Shows Qt5 documentation and examples
+Exec=$QT5BINDIR/assistant
+Icon=assistant-qt5.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;</literal>
+EOF
+
+cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt5 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt5 applications
+Exec=$QT5BINDIR/designer
+Icon=designer-qt5.png
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;</literal>
+EOF
+
+cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt5 Linguist
+Comment=Add translations to Qt5 applications
+Exec=$QT5BINDIR/linguist
+Icon=linguist-qt5.png
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;</literal>
+EOF
+
+cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt5 QDbusViewer
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=$QT5BINDIR/qdbusviewer
+Icon=qdbusviewer-qt5.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Debugger;</literal>
+EOF</userinput></screen>
+
+    <para>
+      Some packages such as <xref linkend='vlc'/> look for certain
+      executables with a -qt5 suffix.  Run the following command as the
+      &root; user to create the necessary symlinks:
+    </para>
+
+<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
+  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt5
+done</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-confirm-license</parameter>: Accept license
+      without prompting user during configuration.
+    </para>
+
+    <para>
+      <parameter>-opensource</parameter>: Install the opensource
+      version of <application>qt</application>.
+    </para>
+
+    <para>
+      <parameter>-nomake examples</parameter>: This switch
+      disables building of the example programs included
+      in the source tarball. Remove it if you want to build
+      them.
+    </para>
+
+    <para>
+      <parameter>-system-sqlite</parameter>: This switch enables use
+      of the system version of <application>SQLite</application>.
+    </para>
+
+    <para>
+      <parameter>-system-harfbuzz</parameter>: This switch enables use
+      of the system version of <application>Harfbuzz</application>.
+    </para>
+
+    <para>
+      <parameter>-dbus-linked</parameter>
+      <parameter>-openssl-linked</parameter>: These
+      switches enable explicit linking of the
+      <application>D-Bus</application> and
+      <application>OpenSSL</application> libraries into
+      <application>qt5</application> libraries instead of
+      <command>dlopen()</command>-ing them.
+    </para>
+
+    <para revision="sysv">
+      <parameter>-syslog</parameter>: This switch allows to send qt messages
+      to the <command>syslog</command> logging system.
+    </para>
+
+    <para revision="systemd">
+      <parameter>-journald</parameter>: This switch allows to send qt messages
+      to the <command>journald</command> logging system.
+    </para>
+
+    <para>
+      <command>$(cat tempconf)</command>: This command provides a list of
+      components that should not be built. These entries are in the form of
+      "-skip &lt;component&gt;".
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring qt5</title>
+
+    <sect3 id="qt5-config">
+      <title>Configuration Information</title>
+
+      <para>
+        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
+        the super user as well. Execute the following commands as the
+        &root; user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
+<literal>Defaults env_keep += QT5DIR</literal>
+EOF</userinput></screen>
+
+      <bridgehead renderas="sect4">If you installed qt5 in /usr</bridgehead>
+
+      <para>
+        If you installed <application>qt5</application> in
+        <filename class="directory">/usr</filename>, create an
+        environment variable needed by certain packages.
+        As the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/qt5.sh
+
+QT5DIR=/usr
+export QT5DIR
+
+# End /etc/profile.d/qt5.sh</literal>
+EOF</userinput></screen>
+
+      <bridgehead renderas="sect4">If you did not install qt5 in /usr</bridgehead>
+
+      <para>
+        If you installed <application>qt5</application> in a location other
+        than <filename class="directory">/usr</filename>, you need to update the
+        following configuration files so that <application>qt5</application> is
+        correctly found by other packages and system processes.
+      </para>
+
+      <para>
+        As the <systemitem class="username">root</systemitem> user, update
+        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
+        run-time cache file:
+      </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
+<literal># Begin Qt addition
+
+/opt/qt5/lib
+
+# End Qt addition</literal>
+EOF
+
+ldconfig</userinput></screen>
+
+      <indexterm zone="qt5-components qt5-config">
+        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+      </indexterm>
+
+      <para>
+        As the &root; user, create the <filename>/etc/profile.d/qt5.sh</filename> file:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt_5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/qt_5.sh
+
+QT5DIR=/opt/qt5
+
+pathappend $QT5DIR/bin           PATH
+pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
+
+export QT5DIR
+
+# End /etc/profile.d/qt_5.sh</literal>
+EOF</userinput></screen>
+
+    </sect3>
 
   </sect2>
@@ -178 +583 @@
       <seglistitem>
         <seg>
-          None
+          assistant, designer, fixqt4headers.pl, lconvert,
+          linguist, lprodump, lrelease, lrelease-pro, lupdate, lupdate-pro,
+          moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
+          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc,
+          qhelpgenerator, qlalr, qmake, qml, qmlcachegen, qmleasing,
+          qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
+          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
+          qmltyperegistrar,
+          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
+          qtwaylandscanner, qvkgen, rcc, syncqt.pl, tracegen, and
+          uic
         </seg>
         <seg>
-          libQt5&lt;component&gt;.so
+          libQt5AccessibilitySupport.a,
+          libQt5Bootstrap.a,
+          libQt5Concurrent.so,
+          libQt5Core.so,
+          libQt5DBus.so,
+          libQt5Designer.so,
+          libQt5DesignerComponents.so,
+          libQt5DeviceDiscoverySupport.a,
+          libQt5EdidSupport.a,
+          libQt5EglFSDeviceIntegration.so,
+          libQt5EglFsKmsSupport.so,
+          libQt5EglSupport.a,
+          libQt5EventDispatcherSupport.a,
+          libQt5FbSupport.a,
+          libQt5FontDatabaseSupport.a,
+          libQt5GlxSupport.a,
+          libQt5Gui.so,
+          libQt5Help.so,
+          libQt5InputSupport.a,
+          libQt5KmsSupport.a,
+          libQt5LinuxAccessibilitySupport.a,
+          libQt5Network.so,
+          libQt5OpenGL.so,
+          libQt5OpenGLExtensions.a,
+          libQt5PacketProtocol.a,
+          libQt5PlatformCompositorSupport.a,
+          libQt5PrintSupport.so,
+          libQt5Qml.so,
+          libQt5QmlDebug.a,
+          libQt5QmlDevTools.a,
+          libQt5QmlModels.so,
+          libQt5QmlWorkerScript.so,
+          libQt5Quick.so,
+          libQt5QuickParticles.so,
+          libQt5QuickShapes.so,
+          libQt5QuickTest.so,
+          libQt5QuickWidgets.so,
+          libQt5ServiceSupport.a,
+          libQt5Sql.so,
+          libQt5Svg.so,
+          libQt5Test.so,
+          libQt5ThemeSupport.a,
+          libQt5UiTools.a,
+          libQt5WaylandClient.so,
+          libQt5WaylandCompositor.so,
+          libQt5Widgets.so,
+          libQt5X11Extras.so,
+          libQt5XcbQpa.so,
+          libQt5XkbCommonSupport.a,
+          libQt5Xml.so,
+          and several plugins under /opt/qt5/{plugins,qml}
         </seg>
         <seg>
-          $QT5DIR/qml/&lt;component&gt;,
-          $QT5DIR/lib/cmake/&lt;component&gt;, and
-          $QT5DIR/include/&lt;component&gt;
+          /usr/include/qt5,
+          /usr/lib/qt5,
+          /usr/share/doc/qt5, and
+          /usr/share/qt5
+          OR
+          /opt/qt5 and
+          /opt/qt-&qt5-version;
         </seg>
       </seglistitem>
     </segmentedlist>
 
+    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+
+    <variablelist id='qt5-descriptions' xreflabel="Qt5 Short Descriptions">
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="assistant-qt5">
+        <term><command>assistant</command></term>
+        <listitem>
+          <para>
+            is a tool for presenting on-line documentation
+          </para>
+          <indexterm zone="qt5-components assistant-qt5">
+            <primary sortas="b-assistant-qt5">assistant</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="designer-qt5">
+        <term><command>designer</command></term>
+        <listitem>
+          <para>
+            is a full-fledged GUI builder. It includes
+            powerful features such as preview mode, automatic widget
+            layout, support for custom widgets, and an advanced
+            property editor
+          </para>
+          <indexterm zone="qt5-components designer-qt5">
+            <primary sortas="b-designer-qt5">designer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="fixqt4headers.pl">
+        <term><command>fixqt4headers.pl</command></term>
+        <listitem>
+          <para>
+            is a script to replace all Qt 4 style includes with Qt 5 includes
+          </para>
+          <indexterm zone="qt5-components fixqt4headers.pl">
+            <primary sortas="b-fixqt4headers.pl">fixqt4headers.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lconvert-qt5">
+        <term><command>lconvert</command></term>
+        <listitem>
+          <para>
+            is part of Qt5's Linguist tool chain. It can be used as a
+            standalone tool to convert and filter translation data files
+          </para>
+          <indexterm zone="qt5-components lconvert-qt5">
+            <primary sortas="b-lconvert-qt5">lconvert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="linguist-qt5">
+        <term><command>linguist</command></term>
+        <listitem>
+          <para>
+            provides support for translating applications into
+            local languages
+          </para>
+          <indexterm zone="qt5-components linguist-qt5">
+            <primary sortas="b-linguist-qt5">linguist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lrelease-qt5">
+        <term><command>lrelease</command></term>
+        <listitem>
+          <para>
+            is a simple command line tool. It reads XML-based translation
+            file in TS format and produces message files used by the
+            application
+          </para>
+          <indexterm zone="qt5-components lrelease-qt5">
+            <primary sortas="b-lrelease-qt5">lrelease</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lrelease-pro">
+        <term><command>lrelease-pro</command></term>
+        <listitem>
+          <para>
+            extracts project information from qmake projects and passes
+            it to lrelease
+          </para>
+          <indexterm zone="qt5-components lrelease-pro">
+            <primary sortas="b-lrelease-pro">lrelease-pro</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lupdate-qt5">
+        <term><command>lupdate</command></term>
+        <listitem>
+          <para>
+            finds the translatable
+            strings in the specified source, header and Qt Designer
+            interface files, and stores the extracted messages in
+            translation files to be processed by lrelease
+          </para>
+          <indexterm zone="qt5-components lupdate-qt5">
+            <primary sortas="b-lupdate-qt5">lupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lupdate-pro">
+        <term><command>lupdate-pro</command></term>
+        <listitem>
+          <para>
+            reads a Qt project file, an passes the collected information
+            to lupdate
+          </para>
+          <indexterm zone="qt5-components lupdate-pro">
+            <primary sortas="b-lupdate-pro">lupdate-pro</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="moc-qt5">
+        <term><command>moc</command></term>
+        <listitem>
+          <para>
+            generates Qt meta object support code
+          </para>
+          <indexterm zone="qt5-components moc-qt5">
+            <primary sortas="b-moc-qt5">moc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pixeltool-qt5">
+        <term><command>pixeltool</command></term>
+        <listitem>
+          <para>
+            is a desktop magnifier and as you move your mouse around
+            the screen it will show the magnified contents in its window
+          </para>
+          <indexterm zone="qt5-components pixeltool-qt5">
+            <primary sortas="b-pixeltool-qt5">pixeltool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qcollectiongenerator-qt5">
+        <term><command>qcollectiongenerator</command></term>
+        <listitem>
+          <para>
+            processes and converts Qt help files
+          </para>
+          <indexterm zone="qt5-components qcollectiongenerator-qt5">
+            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator-qt5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbuscpp2xml-qt5">
+        <term><command>qdbuscpp2xml</command></term>
+        <listitem>
+          <para>
+            takes a C++ source file and generates a D-Bus XML definition
+            of the interface
+          </para>
+          <indexterm zone="qt5-components qdbuscpp2xml-qt5">
+            <primary sortas="b-qdbuscpp2xml-qt5">qdbuscpp2xml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbus-qt5">
+        <term><command>qdbus</command></term>
+        <listitem>
+          <para>
+            lists available services, object paths,  methods, signals, and
+            properties of objects on a bus
+          </para>
+          <indexterm zone="qt5-components qdbus-qt5">
+            <primary sortas="b-qdbus-qt5">qdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusviewer-qt5">
+        <term><command>qdbusviewer</command></term>
+        <listitem>
+          <para>
+            is a graphical D-Bus browser
+          </para>
+          <indexterm zone="qt5-components qdbusviewer-qt5">
+            <primary sortas="b-qdbusviewer-qt5">qdbusviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdbusxml2cpp-qt5">
+        <term><command>qdbusxml2cpp</command></term>
+        <listitem>
+          <para>
+            is a tool that can be used to parse interface descriptions
+            and produce static code representing those interfaces,
+          </para>
+          <indexterm zone="qt5-components qdbusxml2cpp-qt5">
+            <primary sortas="b-qdbusxml2cpp-qt5">qdbusxml2cpp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdistancefieldgenerator-qt5">
+        <term><command>qdistancefieldgenerator</command></term>
+        <listitem>
+          <para>
+            allows a font cache to be pregenerated for Text.QtRendering to speed
+            up an application's startup if the user interface has a lot of text,
+            or multiple fonts, or a large amount of distinct characters, e.g. in
+            CJK writing systems
+          </para>
+          <indexterm zone="qt5-components qdistancefieldgenerator-qt5">
+            <primary sortas="b-qdistancefieldgenerator-qt5">qdistancefieldgenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qdoc-qt5">
+        <term><command>qdoc</command></term>
+        <listitem>
+          <para>
+            is a tool used by <application>Qt</application> Developers to
+            generate documentation for software projects
+          </para>
+          <indexterm zone="qt5-components qdoc-qt5">
+            <primary sortas="b-qdoc-qt5">qdoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qhelpgenerator-qt5">
+        <term><command>qhelpgenerator</command></term>
+        <listitem>
+          <para>
+            is a tool used to generate a <application>Qt</application>
+            compressed help file
+          </para>
+          <indexterm zone="qt5-components qhelpgenerator-qt5">
+            <primary sortas="b-qhelpgenerator-qt5">qhelpgenerator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qlalr-qt5">
+        <term><command>qlalr</command></term>
+        <listitem>
+          <para>
+            is a tool used to generate code from grammar specifications
+          </para>
+          <indexterm zone="qt5-components qlalr-qt5">
+            <primary sortas="b-qlalr-qt5">qlalr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmake-qt5">
+        <term><command>qmake</command></term>
+        <listitem>
+          <para>
+            uses information stored in project files to
+            determine what should go in the makefiles it
+            generates
+          </para>
+          <indexterm zone="qt5-components qmake-qt5">
+            <primary sortas="b-qmake-qt5">qmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qml">
+        <term><command>qml</command></term>
+        <listitem>
+          <para>
+            executes a QML file
+          </para>
+          <indexterm zone="qt5-components qml">
+            <primary sortas="b-qml">qml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmlcachegen">
+        <term><command>qmlcachegen</command></term>
+        <listitem>
+          <para>
+            supports the creation of cache files at build time
+          </para>
+          <indexterm zone="qt5-components qmlcachegen">
+            <primary sortas="b-qmlcachegen">qmlcachegen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmleasing-qt5">
+        <term><command>qmleasing</command></term>
+        <listitem>
+          <para>
+            is a tool used to define the easing curves using an
+            interactive curve editor
+          </para>
+          <indexterm zone="qt5-components qmleasing-qt5">
+            <primary sortas="b-qmleasing-qt5">qmleasing</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlformat-qt5">
+        <term><command>qmlformat</command></term>
+        <listitem>
+          <para>
+            formats QML files according to the QML coding conventions
+          </para>
+          <indexterm zone="qt5-components qmlformat-qt5">
+            <primary sortas="b-qmlformat-qt5">qmlformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlimportscanner-qt5">
+        <term><command>qmlimportscanner</command></term>
+        <listitem>
+          <para>
+            is a tool used to import QML files from a directory
+          </para>
+          <indexterm zone="qt5-components qmlimportscanner-qt5">
+            <primary sortas="b-qmlimportscanner-qt5">qmlimportscanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmllint-qt5">
+        <term><command>qmllint</command></term>
+        <listitem>
+          <para>
+            is a syntax checker for QML files
+          </para>
+          <indexterm zone="qt5-components qmllint-qt5">
+            <primary sortas="b-qmllint-qt5">qmllint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlmin-qt5">
+        <term><command>qmlmin</command></term>
+        <listitem>
+          <para>
+            removes comments and layout characters from a QML file
+          </para>
+          <indexterm zone="qt5-components qmlmin-qt5">
+            <primary sortas="b-qmlmin-qt5">qmlmin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="qmlplugindump-qt5">
+        <term><command>qmlplugindump</command></term>
+        <listitem>
+          <para>
+            is a tool to create a qmltypes file
+          </para>
+          <indexterm zone="qt5-components qmlplugindump-qt5">
+            <primary sortas="b-qmlplugindump-qt5">qmlplugindump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlpreview-qt5">
+        <term><command>qmlpreview</command></term>
+        <listitem>
+          <para>
+            is a tool used to analyze QML applications
+          </para>
+          <indexterm zone="qt5-components qmlpreview-qt5">
+            <primary sortas="b-qmlpreviewr-qt5">qmlpreview</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlprofiler-qt5">
+        <term><command>qmlprofiler</command></term>
+        <listitem>
+          <para>
+            is a tool which watches QML and JavaScript files on disk and
+            updates the application live with any changes
+          </para>
+          <indexterm zone="qt5-components qmlprofiler-qt5">
+            <primary sortas="b-qmlprofiler-qt5">qmlprofiler</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmlscene-qt5">
+        <term><command>qmlscene</command></term>
+        <listitem>
+          <para>
+            is a utility that loads and displays QML documents even before
+            the application is complete
+          </para>
+          <indexterm zone="qt5-components qmlscene-qt5">
+            <primary sortas="b-qmlscene-qt5">qmlscene</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmltestrunner-qt5">
+        <term><command>qmltestrunner</command></term>
+        <listitem>
+          <para>
+            is a tool used to make tests
+          </para>
+          <indexterm zone="qt5-components qmltestrunner-qt5">
+            <primary sortas="b-qmltestrunner-qt5">qmltestrunner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtattributionsscanner-qt5">
+        <term><command>qtattributionsscanner</command></term>
+        <listitem>
+          <para>
+            processes qt_attribution.json files in Qt sources
+          </para>
+          <indexterm zone="qt5-components qtattributionsscanner-qt5">
+            <primary sortas="b-qtattributionsscanner-qt5">qtattributionsscanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtdiag-qt5">
+        <term><command>qtdiag</command></term>
+        <listitem>
+          <para>
+            is a tool for reporting diagnostic information about Qt and its
+            environment
+          </para>
+          <indexterm zone="qt5-components qtdiag-qt5">
+            <primary sortas="b-qtdiag-qt5">qtdiag</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtpaths-qt5">
+        <term><command>qtpaths</command></term>
+        <listitem>
+          <para>
+            is a tool to query Qt path information
+          </para>
+          <indexterm zone="qt5-components qtpaths-qt5">
+            <primary sortas="b-qtpaths-qt5">qtpaths</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtplugininfo">
+        <term><command>qtplugininfo</command></term>
+        <listitem>
+          <para>
+            dumps meta-data about Qt plugins in JSON format
+          </para>
+          <indexterm zone="qt5-components qtplugininfo">
+            <primary sortas="b-qtplugininfo">qtplugininfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtwaylandscanner">
+        <term><command>qtwaylandscanner</command></term>
+        <listitem>
+          <para>
+            converts Wayland specfiles to C++ headers and code needed for
+            QtWayland
+          </para>
+          <indexterm zone="qt5-components qtwaylandscanner">
+            <primary sortas="b-qtwaylandscanner">qtwaylandscanner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qvkgen">
+        <term><command>qvkgen</command></term>
+        <listitem>
+          <para>
+            converts Vulkan specfiles to C++ headers and code
+          </para>
+          <indexterm zone="qt5-components qvkgen">
+            <primary sortas="b-qvkgen">qvkgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rcc-qt5">
+        <term><command>rcc</command></term>
+        <listitem>
+          <para>
+            is a resource compiler used in conjunction with designer
+          </para>
+          <indexterm zone="qt5-components rcc-qt5">
+            <primary sortas="b-rcc-qt5">rcc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="syncqt.pl-qt5">
+        <term><command>syncqt.pl</command></term>
+        <listitem>
+          <para>
+            is a script to create the forwarding headers in the include
+            directories. It is an internal development tool
+          </para>
+          <indexterm zone="qt5-components syncqt.pl-qt5">
+            <primary sortas="b-syncqt.pl-qt5">syncqt.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tracegen">
+        <term><command>tracegen</command></term>
+        <listitem>
+          <para>
+            is a trace generator for LTTng or ETW
+          </para>
+          <indexterm zone="qt5-components tracegen">
+            <primary sortas="b-tracegen">tracegen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uic-qt5">
+        <term><command>uic</command></term>
+        <listitem>
+          <para>
+            is a Qt user interface compiler
+          </para>
+          <indexterm zone="qt5-components uic-qt5">
+            <primary sortas="b-uic-qt5">uic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
   </sect2>