Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ x/lib/lib.xml	(revision 7aff581495452b929243cdec64caa6b315ed84cd)
@@ -56,6 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.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="qt4-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
Index: x/lib/qt4-systemd.xml
===================================================================
--- x/lib/qt4-systemd.xml	(revision 7aff581495452b929243cdec64caa6b315ed84cd)
+++ x/lib/qt4-systemd.xml	(revision 7aff581495452b929243cdec64caa6b315ed84cd)
@@ -0,0 +1,821 @@
+<?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 qt4-download-http
+           "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
+  <!ENTITY qt4-download-ftp  " ">
+  <!ENTITY qt4-md5sum        "2edbe4d6c2eff33ef91732602f3518eb">
+  <!ENTITY qt4-size          "231 MB">
+  <!ENTITY qt4-buildsize     "2.0 GB">
+  <!ENTITY qt4-time          "37 SBU">
+]>
+
+<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
+  <?dbhtml filename="qt4.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Qt-&qt4-version;</title>
+
+  <indexterm zone="qt4">
+    <primary sortas="a-Qt">Qt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Qt4</title>
+
+    <para>
+      <application>Qt4</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>Qt4</application> is classifiedas a widget toolkit), and
+      also used for developing non-GUI programs such as command-line tools
+      and consoles for servers. One of the major users
+      of <application>Qt4</application> is <application>KDE</application>.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qt4-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qt4-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qt4-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qt4-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qt4-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qt4-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Qt4 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="mesalib"/>,
+      <xref linkend="cacerts"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="icu"/> (unicode support),
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libmng"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="openssl"/>, and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cups"/>,
+      <xref linkend="gtk2"/> (GTK+ 2 theme support),
+      <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="pulseaudio"/>, and
+      <xref linkend="unixodbc"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref linkend="qtchooser"/> (required if installing both
+      Qt4 and Qt5)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/qt4"/>
+    </para>
+  </sect2>
+
+
+  <sect2 role="qt4-prefix">
+    <title>Setting the installation prefix</title>
+
+    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
+
+    <para>
+      If you want to install <application>Qt4</application>
+      in <filename class="directory">/usr</filename>, set the
+      following environment variable:
+    </para>
+
+<screen><userinput>export QT4PREFIX=/usr</userinput></screen>
+
+    <para>
+      The advantage of installing in
+      <filename class="directory">/usr</filename> is that no additional
+      configuration is required. The package files are distributed
+      within several subdirectories of the
+      <filename class="directory">/usr</filename> hierarchy. This is
+      the method that most distributions use. The disadvantage for BLFS
+      users is that this <application>Qt4</application> instance cannot
+      be upgraded while it is in use. It also does not allow reverting
+      to an existing, known working instance of
+      <application>Qt4</application>.
+    </para>
+
+    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
+
+    <para>
+      If you want to install <application>Qt4</application>
+      in a directory other than <filename
+      class="directory">/usr</filename>, ie
+      <filename class="directory">/opt/qt4</filename>, set
+      the following environment variable:
+    </para>
+
+<screen><userinput>export QT4PREFIX=/opt/qt4</userinput></screen>
+
+    <para>
+      The advantage of installing <application>Qt4</application> in a
+      custom directory such as <filename
+      class="directory">/opt/qt4</filename> is that it keeps all the
+      package files consolidated in a dedicated directory hierarchy. By
+      using this method, an update can be made without overwriting a
+      previous installation and users can easily revert to a previous
+      version by changing one symbolic link or merely changing the
+      PATH variable.
+    </para>
+
+    <tip>
+      <para>
+        Sometimes, the installation paths are hardcoded into installed files.
+        This is the reason why <filename class="directory">/opt/qt4</filename>
+        is used as installation prefix instead of <filename
+        class="directory">/opt/qt-&qt4-version;</filename>. After installing
+        <application>Qt4</application>, you may rename the directory and
+        create a symlink:
+      </para>
+
+<screen role="root"><userinput>mv /opt/qt{4,-&qt4-version;}
+ln -sfv qt-&qt4-version; /opt/qt4</userinput></screen>
+
+      <para>
+        Later on, you may want to install other versions of
+        <application>Qt4</application>. To do that, just remove the symlink
+        and use <filename class="directory">/opt/qt4</filename> as the
+        prefix again. Which version of <application>Qt4</application> you
+        use depends only on where the symlink points to.
+      </para>
+    </tip>
+
+    <bridgehead renderas="sect3">Setting the install location for executables</bridgehead>
+
+    <para>
+      Both <application>Qt4</application> and
+      <application>Qt5</application> executables have
+      the same names and will overwrite each other if
+      they are installed in the same prefix. To overcome
+      such problem, BLFS offers <xref linkend="qtchooser"/>,
+      an utility used to switch between different
+      <application>Qt</application> versions.
+    </para>
+
+    <para>
+      If <xref linkend="qtchooser"/> is to be used or
+      if installing both <application>Qt4</application>
+      and <application>Qt5</application> in
+      <filename class="directory">/usr</filename>, the
+      executables need to be installed to a non-standard
+      location in order to avoid the conflict with
+      <application>Qt5</application> ones. To accomplish
+      that, set the following environment variable:
+    </para>
+
+<screen><userinput>export QT4BINDIR=$QT4PREFIX/lib/qt4/bin</userinput></screen>
+
+    <para>
+      If you choose not to install <xref linkend="qtchooser"/>
+      or if you are not going to install
+      <application>Qt5</application>, simply set the bindir to
+      a <filename class="directory">bin</filename> subdir of the
+      default prefix by setting the following environment variable:
+    </para>
+
+<screen><userinput>export QT4BINDIR=$QT4PREFIX/bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Qt4</title>
+
+    <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>
+
+    <warning>
+      <para>
+        If <application>Qt4</application> is being reinstalled into the
+        same directory as an existing instance, run the commands done by
+        <systemitem class="username">root</systemitem>, such as
+        <command>make install</command>, from a console or non-Qt4 based
+        window manager. It overwrites <application>Qt4</application>
+        libraries that should not be in use during the install process.
+      </para>
+    </warning>
+
+    <note>
+      <para>
+        The build time and space required for the full
+        <application>Qt</application> is quite long. The instructions below
+        do not build the tutorials and examples. Removing the
+        <parameter>-nomake</parameter> lines will create a complete build.
+      </para>
+    </note>
+
+    <para>
+      Fix DoS vulnerability in the GIF image handler:
+    </para>
+
+<screen><userinput>sed -i -e '631a if (image->isNull()) { state = Error; return -1; }' \
+    src/gui/image/qgifhandler.cpp</userinput></screen>
+
+    <para>
+      Install <application>Qt4</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
+     config.tests/unix/libmng/libmng.cpp &amp;&amp;
+
+sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
+     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
+
+./configure -prefix         $QT4PREFIX                        \
+            -sysconfdir     /etc/xdg                          \
+            -bindir         $QT4BINDIR                        \
+            -plugindir      $QT4PREFIX/lib/qt4/plugins        \
+            -importdir      $QT4PREFIX/lib/qt4/imports        \
+            -headerdir      $QT4PREFIX/include/qt4            \
+            -datadir        $QT4PREFIX/share/qt4              \
+            -docdir         $QT4PREFIX/share/doc/qt4          \
+            -translationdir $QT4PREFIX/share/qt4/translations \
+            -demosdir       $QT4PREFIX/share/doc/qt4/demos    \
+            -examplesdir    $QT4PREFIX/share/doc/qt4/examples \
+            -confirm-license   \
+            -opensource        \
+            -release           \
+            -dbus-linked       \
+            -openssl-linked    \
+            -system-sqlite     \
+            -no-phonon         \
+            -no-phonon-backend \
+            -no-openvg         \
+            -nomake demos      \
+            -nomake examples   \
+            -optimized-qmake   &amp;&amp;
+
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Remove references to the build directory from the
+      <filename class="extension">.pc</filename> files by running
+      the following command:
+    </para>
+
+<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <warning>
+      <para>
+        Make sure that <envar>QT4PREFIX</envar> and <envar>QT4BINDIR</envar>
+        environment variables are set for the
+        <systemitem class="username">root</systemitem> user too.
+      </para>
+    </warning>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+rm -rf $QT4PREFIX/tests</userinput></screen>
+
+    <para>
+      Remove references to the build directory from installed files by
+      running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
+            Designer Gui Help Multimedia Network OpenGL Script \
+            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon; do
+
+     [ -e $QT4PREFIX/lib/libQt${file}.prl ] &amp;&amp;
+     sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
+         -i $QT4PREFIX/lib/libQt${file}.prl
+done
+unset file</userinput></screen>
+
+    <para>
+      Install images and create the menu entries for installed
+      applications by running the following commands 
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
+                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
+
+install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
+                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
+
+install -v -Dm644 tools/designer/src/designer/images/designer.png \
+                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
+
+install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
+                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
+
+install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
+
+install -v -dm755 /usr/share/applications &amp;&amp;
+
+cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt4 Assistant 
+Comment=Shows Qt4 documentation and examples
+Exec=$QT4BINDIR/assistant
+Icon=assistant-qt4.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;</literal>
+EOF
+
+cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt4 Designer
+Comment=Design GUIs for Qt4 applications
+Exec=$QT4BINDIR/designer
+Icon=designer-qt4.png
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;</literal>
+EOF
+
+cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt4 Linguist 
+Comment=Add translations to Qt4 applications
+Exec=$QT4BINDIR/linguist
+Icon=linguist-qt4.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-qt4.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt4 QDbusViewer 
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=$QT4BINDIR/qdbusviewer
+Icon=qdbusviewer-qt4.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Debugger;</literal>
+EOF
+
+cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
+<literal>[Desktop Entry]
+Name=Qt4 Config 
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=$QT4BINDIR/qtconfig
+Icon=qt4logo.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Settings;</literal>
+EOF</userinput></screen>
+
+    <para>
+      Some packages look for <application>Qt4</application> executables
+      with <filename>-qt4</filename> suffix. Run the following command
+      as the <systemitem class="username">root</systemitem> user to
+      create the necessary symlinks:
+    </para>
+
+<screen role="root"><userinput>for file in assistant designer lconvert linguist lrelease lupdate \
+            moc pixeltool qcollectiongenerator qdbus qdbuscpp2xml \
+            qdbusviewer qdbusxml2cpp qdoc3 qhelpconverter         \
+            qhelpgenerator qmake qmlplugindump qmlviewer qt3to4   \
+            qtconfig qttracereplay rcc uic uic3 xmlpatterns       \
+            xmlpatternsvalidator
+do
+  ln -sfrv $QT4BINDIR/$file /usr/bin/$file-qt4
+done
+unset file</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ...</command>: First command fixes detection of
+      <application>libmng</application> 2.0 and second one prevents configure
+      script from writing to the root directory if building as privileged user.
+    </para>
+
+    <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>-release</parameter>: This switch disables
+      building with debugging symbols.
+    </para>
+
+    <para>
+      <parameter>-nomake examples -nomake demos</parameter>:
+      These switches disable building programs that are only of
+      interest to a developer using <application>Qt</application>.
+    </para>
+
+    <para>
+      <parameter>-system-sqlite</parameter>: This switch enables use
+      the system version of <application>SQLite</application>.
+    </para>
+
+    <para>
+      <parameter>-no-phonon -no-phonon-backend</parameter>: These
+      switches disable building of the bundled
+      <application>Phonon</application> library. Better version
+      is provided by <xref linkend="phonon"/> package.
+    </para>
+
+    <para>
+      <parameter>-dbus-linked -openssl-linked</parameter>: These
+      switches enable explicit linking of the
+      <application>D-Bus</application> and
+      <application>OpenSSL</application> libraries into
+      <application>Qt</application> libraries instead of
+      <command>dlopen()</command>-ing them.
+    </para>
+
+    <para>
+      <parameter>-no-openvg</parameter>: This switch disables
+      <application>OpenVG</application> support in
+      <application>Qt</application>.
+    </para>
+
+    <para>
+      <parameter>-optimized-qmake</parameter>: This switch enables
+      building of the optimized <command>qmake</command> program.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Qt4</title>
+
+    <sect3 id="qt4-config">
+      <title>Configuration Information</title>
+
+      <note>
+        <para>
+          If you have installed <application>Qt4</application>
+          in <filename class="directory">/usr</filename> you
+          can skip this section.
+        </para>
+      </note>
+
+      <para>
+        If you installed <application>Qt4</application> in a location other
+        than <filename class="directory">/usr</filename>, you need to update the
+        following configuration files so that <application>Qt4</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 Qt4 addition
+
+$QT4PREFIX/lib
+
+# End Qt4 addition</literal>
+EOF
+
+ldconfig</userinput></screen>
+
+      <indexterm zone="qt4 qt4-config">
+        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+      </indexterm>
+
+      <para>
+        If you have installed <xref linkend="qtchooser"/>, create
+        the <filename>/etc/profile.d/qt4.sh</filename> file by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt4.sh
+
+pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
+
+# End /etc/profile.d/qt4.sh</literal>
+EOF</userinput></screen>
+
+      <para>
+        If you have not installed <xref linkend="qtchooser"/>,
+        create the <filename>/etc/profile.d/qt4.sh</filename>
+        file by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt4.sh
+
+pathappend $QT4BINDIR               PATH
+pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
+
+# End /etc/profile.d/qt4.sh</literal>
+EOF</userinput></screen>
+
+      <note>
+        <para>
+          If <xref linkend="qtchooser"/> is not installed and you
+          also have <application>Qt5</application> installed,
+          you will need to manually adjust the <envar>PATH</envar>
+          variable depending on which <application>Qt</application>
+          version is needed.
+        </para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          assistant, designer, lconvert, linguist,
+          lrelease, lupdate, moc, pixeltool,
+          qcollectiongenerator, qdbuscpp2xml, qdbus,
+          qdbusviewer, qdbusxml2cpp, qdoc3, qhelpconverter,
+          qhelpgenerator, qmake, qmlplugindump, qmlviewer,
+          qt3to4, qtconfig, qttracereplay, rcc, uic3,
+          uic, xmlpatterns, and xmlpatternsvalidator
+        </seg>
+        <seg>
+          libQtUiTools.a, libQt3Support.so, libQtCLucene.so, libQtCore.so,
+          libQtDBus.so, libQtDeclarative.so, libQtDesignerComponents.so,
+          libQtDesigner.so, libQtGui.so, libQtHelp.so, libQtMultimedia.so,
+          libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
+          libQtSql.so, libQtSvg.so, libQtTest.so, libQtWebKit.so,
+          libQtXmlPatterns.so, and libQtXml.so, and several plugins under
+          /opt/qt4/imports and /opt/qt4/plugins
+        </seg>
+        <seg>
+          $QT4PREFIX/include/qt4,
+          $QT4PREFIX/lib/qt4,
+          $QT4PREFIX/share/doc/qt4, and
+          $QT4PREFIX/share/qt4 
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="assistant-qt4">
+        <term><command>assistant</command></term>
+        <listitem>
+          <para>
+            is a tool for presenting on-line documentation.
+          </para>
+          <indexterm zone="qt4 assistant-qt4">
+            <primary sortas="b-assistant-qt4">assistant</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="designer-qt4">
+        <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="qt4 designer-qt4">
+            <primary sortas="b-designer-qt4">designer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="linguist-qt4">
+        <term><command>linguist</command></term>
+        <listitem>
+          <para>
+            provides support for translating applications into
+            local languages.
+          </para>
+          <indexterm zone="qt4 linguist-qt4">
+            <primary sortas="b-linguist-qt4">linguist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lrelease-qt4">
+        <term><command>lrelease</command></term>
+        <listitem>
+          <para>
+            is a simple command line tool. It reads a Qt project
+            file and produces message files used by the application.
+          </para>
+          <indexterm zone="qt4 lrelease-qt4">
+            <primary sortas="b-lrelease-qt4">lrelease</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lupdate-qt4">
+        <term><command>lupdate</command></term>
+        <listitem>
+          <para>
+            reads a Qt project file, finds the translatable
+            strings in the specified source, header and Qt Designer
+            interface files, and produces or updates the translation
+            files listed in the project file.
+          </para>
+          <indexterm zone="qt4 lupdate-qt4">
+            <primary sortas="b-lupdate-qt4">lupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="moc-qt4">
+        <term><command>moc</command></term>
+        <listitem>
+          <para>
+            generates Qt meta object support code.
+          </para>
+          <indexterm zone="qt4 moc-qt4">
+            <primary sortas="b-moc-qt4">moc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pixeltool-qt4">
+        <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="qt4 pixeltool-qt4">
+            <primary sortas="b-pixeltool-qt4">pixeltool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qmake-qt4">
+        <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="qt4 qmake-qt4">
+            <primary sortas="b-qmake-qt4">qmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt3to4-qt4">
+        <term><command>qt3to4</command></term>
+        <listitem>
+          <para>
+            qt3to4 is a tool to help update Qt3 code to Qt4.
+          </para>
+          <indexterm zone="qt4 qt3to4-qt4">
+            <primary sortas="b-qt3to4-qt4">qt3to4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qtconfig-qt4">
+        <term><command>qtconfig</command></term>
+        <listitem>
+          <para>
+            is used to customize the appearance of Qt applications.
+          </para>
+          <indexterm zone="qt4 qtconfig-qt4">
+            <primary sortas="b-qtconfig-qt4">qtconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rcc-qt4">
+        <term><command>rcc</command></term>
+        <listitem>
+          <para>
+            is a resource compiler used in conjunction with designer.
+          </para>
+          <indexterm zone="qt4 rcc-qt4">
+            <primary sortas="b-rcc-qt4">rcc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uic-qt4">
+        <term><command>uic</command></term>
+        <listitem>
+          <para>
+            is a Qt user interface compiler.
+          </para>
+          <indexterm zone="qt4 uic-qt4">
+            <primary sortas="b-uic-qt4">uic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uic3-qt4">
+        <term><command>uic3</command></term>
+        <listitem>
+          <para>
+            is a tool to generate Qt4 code out of
+            user interface files generated by the Qt3
+            version of designer.
+          </para>
+          <indexterm zone="qt4 uic3-qt4">
+            <primary sortas="b-uic3-qt4">uic3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ 	(revision )
@@ -1,748 +1,0 @@
-<?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 qt4-download-http
-           "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-download-ftp  " ">
-  <!ENTITY qt4-md5sum        "2edbe4d6c2eff33ef91732602f3518eb">
-  <!ENTITY qt4-size          "231 MB">
-  <!ENTITY qt4-buildsize     "2.0 GB">
-  <!ENTITY qt4-time          "37 SBU">
-]>
-
-<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
-  <?dbhtml filename="qt4.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt4-version;</title>
-
-  <indexterm zone="qt4">
-    <primary sortas="a-Qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt</title>
-
-    <para>
-      <application>Qt</application> is a cross-platform application
-      framework that is widely used for developing application software
-      with a graphical user interface (GUI) (in which cases Qt is classified
-      as a widget toolkit), and also used for developing non-GUI programs such
-      as command-line tools and consoles for servers. One of the major users
-      of <application>Qt</application> is <application>KDE</application>.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="cacerts"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="icu"/> (unicode support),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="openssl"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="gtk2"/> (GTK+ 2 theme support),
-      <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qt4"/>
-    </para>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../xincludes/qt-alternatives.xml"/>
-
-  <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <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>
-
-    <warning>
-      <para>
-        If <application>Qt4</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt4 based
-        window manager. It overwrites <application>Qt4</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> lines will create a complete build.
-      </para>
-    </note>
-
-    <para>
-      Fix DoS vulnerability in the GIF image handler:
-    </para>
-
-<screen><userinput>sed -i -e '631a if (image->isNull()) { state = Error; return -1; }' \
-    src/gui/image/qgifhandler.cpp</userinput></screen>
-
-<!-- ==== Method 1 ====== -->
-    <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
-
-    <para>
-      Install <application>Qt4</application> into the <filename
-      class='directory'>/usr</filename> hierarchy by running the following
-      commands:
-    </para>
-
-<screen><userinput>export QT4LINK=/usr
-
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
-     config.tests/unix/libmng/libmng.cpp &amp;&amp;
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
-     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
-
-./configure -prefix         /usr                 \
-            -bindir         /usr/bin             \
-            -plugindir      /usr/lib/qt4/plugins \
-            -importdir      /usr/lib/qt4/imports \
-            -headerdir      /usr/include/qt4     \
-            -datadir        /usr/share/qt4       \
-            -sysconfdir     /etc/xdg             \
-            -docdir         /usr/share/doc/qt4   \
-            -demosdir       /usr/share/doc/qt4/demos    \
-            -examplesdir    /usr/share/doc/qt4/examples \
-            -translationdir /usr/share/qt4/translations \
-            -confirm-license   \
-            -opensource        \
-            -release           \
-            -dbus-linked       \
-            -openssl-linked    \
-            -system-sqlite     \
-            -no-phonon         \
-            -no-phonon-backend \
-            -no-nis            \
-            -no-openvg         \
-            -nomake demos      \
-            -nomake examples   \
-            -optimized-qmake   &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Remove references to the build directory from the
-      <filename class="extension">.pc</filename> files by running
-      the following command:
-    </para>
-
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>Now as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -rf /usr/tests</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon; do
-
-     [ -e /usr/lib/libQt${file}.prl ] &amp;&amp;
-     sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
-         -i /usr/lib/libQt${file}.prl
-done
-unset file</userinput></screen>
-
-<!-- ==== Method 2 ====== -->
-    <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead>
-
-    <para>
-      This section provides for installing Qt4 almost all of the files in the
-      <filename class="directory">/opt</filename> directory.
-    </para>
-
-<screen><userinput>export QT4DIR=/opt/qt-&qt4-version; &amp;&amp;
-export QT4LINK=/opt/qt4 &amp;&amp;
-
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
-     config.tests/unix/libmng/libmng.cpp &amp;&amp;
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
-     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
-
-./configure -prefix     $QT4DIR  \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -release             \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-sqlite       \
-            -plugin-sql-sqlite   \
-            -no-phonon           \
-            -no-phonon-backend   \
-            -no-nis              \
-            -no-openvg           \
-            -nomake demos        \
-            -nomake examples     \
-            -optimized-qmake     &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install
-ln -svfn $QT4DIR /opt/qt4</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for file in `basename -a -s .prl $QT4DIR/lib/lib*.prl`; do
-       sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
-              -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
-              -i $QT4DIR/lib/${file}.prl
-
-   perl -pi -e "s, -L$PWD/?\S+,,g" $QT4DIR/lib/pkgconfig/${file##lib}.pc
-done
-
-unset file</userinput></screen>
-
-<!-- ==== Common  ====== -->
-    <bridgehead renderas="sect3">Continuing for Both Methods</bridgehead>
-
-      <para>
-        For all methods, install images and create the menu entries 
-        for installed applications.  Be sure that the <envar>QT4LINK</envar>
-        variable is defined in root's environment and 
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
-
-install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
-
-install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
-
-install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
-
-install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Assistant 
-Comment=Shows Qt4 documentation and examples
-Exec=$QT4LINK/bin/assistant
-Icon=assistant-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Designer
-Comment=Design GUIs for Qt4 applications
-Exec=$QT4LINK/bin/designer
-Icon=designer-qt4.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Linguist 
-Comment=Add translations to Qt4 applications
-Exec=$QT4LINK/bin/linguist
-Icon=linguist-qt4.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-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 QDbusViewer 
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT4LINK/bin/qdbusviewer
-Icon=qdbusviewer-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Config 
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=$QT4LINK/bin/qtconfig
-Icon=qt4logo.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: First command fixes detection of
-      <application>libmng</application> 2.0 and second one prevents configure
-      script from writing to the root directory if building as privileged user.
-    </para>
-
-    <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>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </para>
-
-    <para>
-      <parameter>-nomake examples -nomake demos</parameter>:
-      These switches disable building programs that are only of
-      interest to a developer using <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-no-nis</parameter>: This switch disables support
-      for Network Information Service (NIS) which has been
-      deprecated in recent versions of <application>Glibc</application>.
-    </para>
-
-    <para>
-      <parameter>-no-phonon -no-phonon-backend</parameter>: These
-      switches disable building of the bundled
-      <application>Phonon</application> library. Better version
-      is provided by <xref linkend="phonon"/> package.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked -openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para>
-      <parameter>-no-openvg</parameter>: This switch disables
-      <application>OpenVG</application> support in
-      <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-optimized-qmake</parameter>: This switch enables
-      building of the optimized <command>qmake</command> program.
-    </para>
-
-    <para>
-      <option>-no-dbus</option>: Use this switch if you don't have
-      <application>D-Bus</application> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt</title>
-
-    <sect3 id="qt4-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you installed <application>Qt</application> in /usr,
-        create an environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt4.sh
-
-QT4DIR=/usr
-export QT4DIR
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-   <para>
-      If you installed <application>Qt</application> in a location other
-      than /usr, you need to update the following configuration files so
-      that <application>Qt</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/qt4/lib
-   
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-   
-   <indexterm zone="qt4 qt4-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-   </indexterm>
-   
-   <para>
-      As the <systemitem class="username">root</systemitem> user, create
-      the <filename>/etc/profile.d/qt4.sh</filename> file:
-   </para>
-   
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt4.sh
-   
-QT4DIR=/opt/qt4
-   
-pathappend /opt/qt4/bin           PATH
-pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
-   
-export QT4DIR
-   
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-
-    </sect3>
-   
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-                href="../../xincludes/setqt.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          assistant, designer, lconvert, linguist,
-          lrelease, lupdate, moc, pixeltool,
-          qcollectiongenerator, qdbuscpp2xml, qdbus,
-          qdbusviewer, qdbusxml2cpp, qdoc3, qhelpconverter,
-          qhelpgenerator, qmake, qmlplugindump, qmlviewer,
-          qt3to4, qtconfig, qttracereplay, rcc, uic3,
-          uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libQtUiTools.a, libQt3Support.so, libQtCLucene.so, libQtCore.so,
-          libQtDBus.so, libQtDeclarative.so, libQtDesignerComponents.so,
-          libQtDesigner.so, libQtGui.so, libQtHelp.so, libQtMultimedia.so,
-          libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
-          libQtSql.so, libQtSvg.so, libQtTest.so, libQtWebKit.so,
-          libQtXmlPatterns.so, and libQtXml.so, and several plugins under
-          /opt/qt4/imports and /opt/qt4/plugins
-        </seg>
-        <seg>
-          /usr/include/qt4,
-          /usr/lib/qt4,
-          /usr/share/doc/qt4, and
-          /usr/share/qt4 
-          OR 
-          /opt/qt4 and 
-          /opt/qt-&qt4-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt4">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation.
-          </para>
-          <indexterm zone="qt4 assistant-qt4">
-            <primary sortas="b-assistant-qt4">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt4">
-        <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="qt4 designer-qt4">
-            <primary sortas="b-designer-qt4">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt4">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages.
-          </para>
-          <indexterm zone="qt4 linguist-qt4">
-            <primary sortas="b-linguist-qt4">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt4">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads a Qt project
-            file and produces message files used by the application.
-          </para>
-          <indexterm zone="qt4 lrelease-qt4">
-            <primary sortas="b-lrelease-qt4">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt4">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and produces or updates the translation
-            files listed in the project file.
-          </para>
-          <indexterm zone="qt4 lupdate-qt4">
-            <primary sortas="b-lupdate-qt4">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt4">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code.
-          </para>
-          <indexterm zone="qt4 moc-qt4">
-            <primary sortas="b-moc-qt4">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt4">
-        <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="qt4 pixeltool-qt4">
-            <primary sortas="b-pixeltool-qt4">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt4">
-        <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="qt4 qmake-qt4">
-            <primary sortas="b-qmake-qt4">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt3to4-qt4">
-        <term><command>qt3to4</command></term>
-        <listitem>
-          <para>
-            qt3to4 is a tool to help update Qt3 code to Qt4.
-          </para>
-          <indexterm zone="qt4 qt3to4-qt4">
-            <primary sortas="b-qt3to4-qt4">qt3to4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig-qt4">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>
-            is used to customize the appearance of Qt applications.
-          </para>
-          <indexterm zone="qt4 qtconfig-qt4">
-            <primary sortas="b-qtconfig-qt4">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt4">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer.
-          </para>
-          <indexterm zone="qt4 rcc-qt4">
-            <primary sortas="b-rcc-qt4">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt4">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler.
-          </para>
-          <indexterm zone="qt4 uic-qt4">
-            <primary sortas="b-uic-qt4">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic3-qt4">
-        <term><command>uic3</command></term>
-        <listitem>
-          <para>
-            is a tool to generate Qt4 code out of
-            user interface files generated by the Qt3
-            version of designer.
-          </para>
-          <indexterm zone="qt4 uic3-qt4">
-            <primary sortas="b-uic3-qt4">uic3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt5-systemd.xml
===================================================================
--- x/lib/qt5-systemd.xml	(revision 7aff581495452b929243cdec64caa6b315ed84cd)
+++ x/lib/qt5-systemd.xml	(revision 7aff581495452b929243cdec64caa6b315ed84cd)
@@ -0,0 +1,744 @@
+<?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.3">
+  <!ENTITY qt5-url   "http://download.qt-project.org/official_releases/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        "c4e893678e3d8388ab04d059523d1d78">
+  <!ENTITY qt5-size          "170 MB">
+  <!ENTITY qt5-buildsize     "2.6 GB (169 MB installed)">
+  <!ENTITY qt5-time          "93 SBU">
+]>
+
+<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
+  <?dbhtml filename="qt5.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Qt-&qt5-version;</title>
+
+  <indexterm zone="qt5">
+    <primary sortas="a-Qt">Qt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Qt5</title>
+
+    <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. 
+    </para>
+
+    &lfs76_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 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="mesalib"/>,
+      <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">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cacerts"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="gst-plugins-base"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="icu"/> (unicode support, also required for QtWebKit),
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libmng"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="libxkbcommon"/>,
+      <xref linkend="mtdev"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="ruby"/> (required for QtWebKit), and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="geoclue"/>,
+      <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
+      <xref linkend="gtk2"/> (GTK+ Theme Support),
+      <xref linkend="ibus"/>,
+      <xref linkend="mariadb"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="pulseaudio"/>, and 
+      <xref linkend="unixodbc"/>
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref linkend="qtchooser"/> (required if installing both
+      Qt4 and Qt5)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/qt5"/>
+    </para>
+  </sect2>
+
+  <sect2 role="qt5-prefix">
+    <title>Setting the installation prefix</title>
+
+    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
+
+    <para>
+      If you want to install <application>Qt5</application>
+      in <filename class="directory">/usr</filename>, set the
+      following environment variable:
+    </para>
+
+<screen><userinput>export QT5PREFIX=/usr</userinput></screen>
+
+    <para>
+      The advantage of installing in
+      <filename class="directory">/usr</filename> is that no additional
+      configuration is required. The package files are distributed
+      within several subdirectories of the
+      <filename class="directory">/usr</filename> hierarchy. This is
+      the method that most distributions use. The disadvantage for BLFS
+      users is that this <application>Qt5</application> instance cannot
+      be upgraded while it is in use. It also does not allow reverting
+      to an existing, known working instance of
+      <application>Qt5</application>.
+    </para>
+
+    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
+
+    <para>
+      If you want to install <application>Qt5</application>
+      in a directory other than <filename
+      class="directory">/usr</filename>, ie
+      <filename class="directory">/opt/qt5</filename>, set
+      the following environment variable:
+    </para>
+
+<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
+
+    <para>
+      The advantage of installing <application>Qt5</application> in a
+      custom directory such as <filename
+      class="directory">/opt/qt5</filename> is that it keeps all the
+      package files consolidated in a dedicated directory hierarchy. By
+      using this method, an update can be made without overwriting a
+      previous installation and users can easily revert to a previous
+      version by changing one symbolic link or merely changing the
+      PATH variable.
+    </para>
+
+    <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>. After installing
+        <application>Qt5</application>, you may rename the directory and
+        create a symlink:
+      </para>
+
+<screen role="root"><userinput>mv /opt/qt{5,-&qt5-version;}
+ln -sfv 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 to.
+      </para>
+    </tip>
+
+    <bridgehead renderas="sect3">Setting the install location for executables</bridgehead>
+
+    <para>
+      Both <application>Qt4</application> and
+      <application>Qt5</application> executables have
+      the same names and will overwrite each other if
+      they are installed in the same prefix. To overcome
+      such problem, BLFS offers <xref linkend="qtchooser"/>,
+      an utility used to switch between different
+      <application>Qt</application> versions.
+    </para>
+
+    <para>
+      If <xref linkend="qtchooser"/> is to be used or
+      if installing both <application>Qt4</application>
+      and <application>Qt5</application> in
+      <filename class="directory">/usr</filename>, the
+      executables need to be installed to a non-standard
+      location in order to avoid the conflict with
+      <application>Qt4</application> ones. To accomplish
+      that, set the following environment variable:
+    </para>
+
+<screen><userinput>export QT5BINDIR=$QT5PREFIX/lib/qt5/bin</userinput></screen>
+
+    <para>
+      If you choose not to install <xref linkend="qtchooser"/>
+      or if you are not going to install
+      <application>Qt4</application>, simply set the bindir to
+      a <filename class="directory">bin</filename> subdir of the
+      default prefix by setting the following environment variable:
+    </para>
+
+<screen><userinput>export QT5BINDIR=$QT5PREFIX/bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Qt5</title>
+
+    <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>
+
+    <warning>
+      <para>
+        If <application>Qt5</application> is being reinstalled into the
+        same directory as an existing instance, run the commands done by
+        <systemitem class="username">root</systemitem>, 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>
+
+    <para>
+      Install <application>Qt5</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure -prefix         $QT5PREFIX                        \
+            -sysconfdir     /etc/xdg                          \
+            -bindir         $QT5BINDIR                        \
+            -headerdir      $QT5PREFIX/include/qt5            \
+            -archdatadir    $QT5PREFIX/lib/qt5                \
+            -datadir        $QT5PREFIX/share/qt5              \
+            -docdir         $QT5PREFIX/share/doc/qt5          \
+            -translationdir $QT5PREFIX/share/qt5/translations \
+            -examplesdir    $QT5PREFIX/share/doc/qt5/examples \
+            -confirm-license \
+            -opensource      \
+            -dbus-linked     \
+            -openssl-linked  \
+            -system-harfbuzz \
+            -system-sqlite   \
+            -nomake examples \
+            -optimized-qmake &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Remove references to the build directory from the
+      <filename class="extension">.pc</filename> files by running
+      the following command:
+    </para>
+
+<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <warning>
+      <para>
+        Make sure that <envar>QT5PREFIX</envar> and <envar>QT5BINDIR</envar>
+        environment variables are set for the
+        <systemitem class="username">root</systemitem> user too.
+      </para>
+    </warning>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Remove references to the build directory from installed files by
+      running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>sed -e "s:$PWD/qtbase:$QT5PREFIX/lib/qt5:g" \
+    -i $QT5PREFIX/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
+
+find $QT5PREFIX/lib/lib{Enginio,qgsttools_p,Qt5*}.prl -exec sed -i -r \
+     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
+
+    <para>
+      Install images and create the menu entries for installed
+      applications by running the following commands 
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>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 -v -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 look for <application>Qt5</application> executables
+      with <filename>-qt5</filename> suffix. Run the following command
+      as the <systemitem class="username">root</systemitem> user to
+      create the necessary symlinks:
+    </para>
+
+<screen role="root"><userinput>for file in assistant designer lconvert linguist lrelease lupdate   \
+            moc pixeltool qcollectiongenerator qdbus qdbuscpp2xml   \
+            qdbusviewer qdbusxml2cpp qdoc qhelpconverter            \
+            qhelpgenerator qlalr qmake qml qml1plugindump qmlbundle \
+            qmlimportscanner qmlmin qmlplugindump qmlprofiler       \
+            qmlscene qmltestrunner qmlviewer qtdiag qtpaths         \
+            rcc syncqt.pl uic xmlpatterns xmlpatternsvalidator
+do
+  ln -sfrv $QT5BINDIR/$file /usr/bin/$file-qt5
+done
+unset file</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>-release</parameter>: This switch disables
+      building with debugging symbols.
+    </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-harfbuzz</parameter>: This switch enables use
+      of the system version of <application>Harfbuzz</application>
+      which fixes some font rendering issues in
+      <application>Qt5</application> applications.
+    </para>
+
+    <para>
+      <parameter>-system-sqlite</parameter>: This switch enables use
+      of the system version of <application>SQLite</application>.
+    </para>
+
+    <para>
+      <parameter>-dbus-linked -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>
+      <parameter>-optimized-qmake</parameter>: This switch enables
+      building of the optimized <command>qmake</command> program.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Qt5</title>
+
+    <sect3 id="qt5-config">
+      <title>Configuration Information</title>
+
+      <note>
+        <para>
+          If you have installed <application>Qt5</application>
+          in <filename class="directory">/usr</filename> you
+          can skip this section.
+        </para>
+      </note>
+
+      <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 Qt5 addition
+
+$QT5PREFIX/lib
+
+# End Qt5 addition</literal>
+EOF
+
+ldconfig</userinput></screen>
+
+      <indexterm zone="qt5 qt5-config">
+        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+      </indexterm>
+
+      <para>
+        If you have installed <xref linkend="qtchooser"/>, create
+        the <filename>/etc/profile.d/qt5.sh</filename> file by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt5.sh
+
+pathappend $QT5PREFIX/lib/pkgconfig PKG_CONFIG_PATH
+
+# End /etc/profile.d/qt5.sh</literal>
+EOF</userinput></screen>
+
+      <para>
+        If you have not installed <xref linkend="qtchooser"/>,
+        create the <filename>/etc/profile.d/qt5.sh</filename>
+        file by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
+<literal># Begin /etc/profile.d/qt5.sh
+
+pathappend $QT5BINDIR               PATH
+pathappend $QT5PREFIX/lib/pkgconfig PKG_CONFIG_PATH
+
+# End /etc/profile.d/qt5.sh</literal>
+EOF</userinput></screen>
+
+      <note>
+        <para>
+          If <xref linkend="qtchooser"/> is not installed and you
+          also have <application>Qt4</application> installed,
+          you will need to manually adjust the <envar>PATH</envar>
+          variable depending on which <application>Qt</application>
+          version is needed.
+        </para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          assistant, designer, lconvert, linguist, lrelease,
+          lupdate, moc, pixeltool, qcollectiongenerator, qdbuscpp2xml,
+          qdbus, qdbusviewer, qdbusxml2cpp, qdoc, qhelpconverter,
+          qhelpgenerator, qlalr, qmake, qml1plugindump, qmlbundle,
+          qmlimportscanner, qmlmin, qmlplugindump, qmlprofiler, qml,
+          qmlscene, qmltestrunner, qmlviewer, qtdiag, qtpaths, rcc,
+          syncqt.pl, uic, xmlpatterns, and xmlpatternsvalidator
+        </seg>
+        <seg>
+          libEnginio.so, libqgsttools_p.so, libQt5Bluetooth.so,
+          libQt5Bootstrap.a, libQt5CLucene.so, libQt5Concurrent.so,
+          libQt5Core.so, libQt5DBus.so, libQt5Declarative.so,
+          libQt5DesignerComponents.so, libQt5Designer.so, libQt5Gui.so,
+          libQt5Help.so, libQt5MultimediaQuick_p.so, libQt5Multimedia.so,
+          libQt5MultimediaWidgets.so, libQt5Network.so, libQt5Nfc.so,
+          libQt5OpenGLExtensions.a, libQt5OpenGL.so, libQt5PlatformSupport.a,
+          libQt5Positioning.so, libQt5PrintSupport.so, libQt5QmlDevTools.a,
+          libQt5Qml.so, libQt5QuickParticles.so, libQt5QuickWidgets.so,
+          libQt5Quick.so, libQt5QuickTest.so, libQt5Script.so,
+          libQt5ScriptTools.so, libQt5Sensors.so, libQt5SerialPort.so,
+          libQt5Sql.so, libQt5Svg.so, libQt5Test.so, libQt5UiTools.a,
+          libQt5WebKit.so, libQt5WebKitWidgets.so, libQt5WebSockets.so,
+          libQt5Widgets.so, libQt5X11Extras.so, libQt5XmlPatterns.so,
+          libQt5Xml.so, and several plugins under /opt/qt5/{imports,plugins,qml}
+        </seg>
+        <seg>
+          $QT5PREFIX/include/qt5,
+          $QT5PREFIX/lib/qt5,
+          $QT5PREFIX/share/doc/qt5, and
+          $QT5PREFIX/share/qt5
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <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 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 designer-qt5">
+            <primary sortas="b-designer-qt5">designer</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 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 a Qt project
+            file and produces message files used by the application.
+          </para>
+          <indexterm zone="qt5 lrelease-qt5">
+            <primary sortas="b-lrelease-qt5">lrelease</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lupdate-qt5">
+        <term><command>lupdate</command></term>
+        <listitem>
+          <para>
+            reads a Qt project file, finds the translatable
+            strings in the specified source, header and Qt Designer
+            interface files, and produces or updates the translation
+            files listed in the project file.
+          </para>
+          <indexterm zone="qt5 lupdate-qt5">
+            <primary sortas="b-lupdate-qt5">lupdate</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 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 pixeltool-qt5">
+            <primary sortas="b-pixeltool-qt5">pixeltool</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 qmake-qt5">
+            <primary sortas="b-qmake-qt5">qmake</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 rcc-qt5">
+            <primary sortas="b-rcc-qt5">rcc</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 uic-qt5">
+            <primary sortas="b-uic-qt5">uic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision d72fae5ad0127525bdba5ca158637115d0477174)
+++ 	(revision )
@@ -1,696 +1,0 @@
-<?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.3">
-  <!ENTITY qt5-url   "http://download.qt-project.org/official_releases/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        "c4e893678e3d8388ab04d059523d1d78">
-  <!ENTITY qt5-size          "170 MB">
-  <!ENTITY qt5-buildsize     "2.6 GB (169 MB installed)">
-  <!ENTITY qt5-time          "93 SBU">
-]>
-
-<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
-  <?dbhtml filename="qt5.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt5-version;</title>
-
-  <indexterm zone="qt5">
-    <primary sortas="a-Qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt5</title>
-
-    <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. 
-    </para>
-
-    &lfs76_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 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/>,
-      <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">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cacerts"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst-plugins-base"/>,<!--
-      <xref linkend="harfbuzz"/>, Doesn't have all the features that the included one has. -->
-      <xref linkend="icu"/> (required for QtWebKit),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="mtdev"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="ruby"/> (required for QtWebKit)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="geoclue"/>,
-      <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
-      <xref linkend="gtk2"/> (GTK+ Theme Support),
-      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>, and 
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qt5"/>
-    </para>
-  </sect2>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-               href="../../xincludes/qt-alternatives.xml"/>
-
-  <sect2 role="installation">
-    <title>Installation of Qt5</title>
-
-    <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>
-
-    <warning>
-      <para>
-        If <application>Qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, 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>
-
-<!-- ==== Method 1 ====== -->
-    <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
-
-    <para>
-      Install <application>Qt5</application> by running the
-      following commands:
-    </para>
-
-    <!-- This is rather a bad idea. Most apps that I've seen using Qt5 look for -qt5
-         suffixed programs.  On the other hand, the developer is used to running
-         qmake, linguist, etc from the command line.  
-
-    <note>
-      <para>
-        If <emphasis>not</emphasis> also installing <application>Qt4</application>
-        into the /usr directory, change the entry for -bindir below to /usr/bin.
-      </para>
-    </note> -->
-
-<screen><userinput>export QT5LINK=/usr
-
-./configure -prefix         /usr               \
-            -sysconfdir     /etc/xdg           \
-            -bindir         /usr/bin           \
-            -headerdir      /usr/include/qt5   \
-            -archdatadir    /usr/lib/qt5       \
-            -datadir        /usr/share/qt5     \
-            -docdir         /usr/share/doc/qt5 \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples \
-            -confirm-license   \
-            -opensource        \
-            -dbus-linked       \
-            -openssl-linked    \<!--
-            -system-harfbuzz   \-->
-            -system-sqlite     \
-            -no-nis            \
-            -nomake examples   \
-            -optimized-qmake   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Remove references to the build directory from the
-      <filename class="extension">.pc</filename> files by running
-      the following command:
-    </para>
-
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
-    -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
-
-find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
-     '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
-
-<!-- ==== Method 2 ====== -->
-
-  <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt5-version;</bridgehead>
-
-  <para>
-        This section provides instructions for installing Qt5 in the
-        <filename class="directory">/opt</filename> directory.
-   </para>
-
-<screen><userinput>export QT5DIR=/opt/qt-&qt5-version; &amp;&amp;
-export QT5LINK=/opt/qt5 &amp;&amp;
-
-./configure -prefix     $QT5DIR  \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -dbus-linked         \
-            -openssl-linked      \<!--
-            -system-harfbuzz     \-->
-            -system-sqlite       \
-            -no-nis              \
-            -nomake examples     \
-            -optimized-qmake     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svfn $QT5DIR /opt/qt5</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR -name qt_lib_bootstrap_private.pri \
-   -exec sed -i -e "s:$PWD/qtbase:/$QT5DIR/lib/:g" {} \; &amp;&amp;
-
-find $QT5DIR -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-<!-- This is useful for packages looking explicitly for Qt apps with -qt5 suffix.
-
-    <para>
-      Symlink the <application>Qt5</application> executables into
-      <filename class="directory">/usr/bin</filename> by running the
-      following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ln -svf $QT5DIR /opt/qt5 &amp;&amp;
-
-for file in /opt/qt5/bin/*; do
-  ln -sfv $file /usr/bin/$(basename $file)-qt5
-done</userinput></screen> -->
-
-<!-- ==== Common  ====== -->
-    <bridgehead renderas="sect3">Continuing for Both Methods</bridgehead>
-
-    <para>
-      For all methods, install images and create the menu entries
-      for installed applications.  Be sure that the <envar>QT5LINK</envar>
-      variable is defined in root's environment and
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>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=$QT5LINK/bin/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=$QT5LINK/bin/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=$QT5LINK/bin/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=$QT5LINK/bin/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e "..." -e "..." -i ...</command>: This
-      command fixes detection of
-      <application>libmng</application> 2.0.
-    </para>
-
-    <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>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </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-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>
-      which fixes some font rendering issues in
-      <application>Qt5</application> applications.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-no-nis</parameter>: This switch disables support
-      for Network Information Service (NIS) which has been
-      removed from recent versions of <application>Glibc</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked -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>
-      <parameter>-optimized-qmake</parameter>: This switch enables
-      building of the optimized <command>qmake</command> program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt5</title>
-
-    <sect3 id="qt5-config">
-      <title>Configuration Information</title>
-
-      <para>
-        Create the menu entries for installed applications by running the
-        following commands <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-      <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="root"><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>
-
-      <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 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/opt/qt5
-
-pathappend /opt/qt5/bin           PATH
-pathappend /opt/qt5/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-               href="../../xincludes/setqt.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          assistant, designer, lconvert, linguist, lrelease,
-          lupdate, moc, pixeltool, qcollectiongenerator, qdbuscpp2xml,
-          qdbus, qdbusviewer, qdbusxml2cpp, qdoc, qhelpconverter,
-          qhelpgenerator, qlalr, qmake, qml1plugindump, qmlbundle,
-          qmlimportscanner, qmlmin, qmlplugindump, qmlprofiler, qml,
-          qmlscene, qmltestrunner, qmlviewer, qtdiag, qtpaths, rcc,
-          syncqt.pl, uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libEnginio.so, libqgsttools_p.so, libQt5Bluetooth.so,
-          libQt5Bootstrap.a, libQt5CLucene.so, libQt5Concurrent.so,
-          libQt5Core.so, libQt5DBus.so, libQt5Declarative.so,
-          libQt5DesignerComponents.so, libQt5Designer.so, libQt5Gui.so,
-          libQt5Help.so, libQt5MultimediaQuick_p.so, libQt5Multimedia.so,
-          libQt5MultimediaWidgets.so, libQt5Network.so, libQt5Nfc.so,
-          libQt5OpenGLExtensions.a, libQt5OpenGL.so, libQt5PlatformSupport.a,
-          libQt5Positioning.so, libQt5PrintSupport.so, libQt5QmlDevTools.a,
-          libQt5Qml.so, libQt5QuickParticles.so, libQt5QuickWidgets.so,
-          libQt5Quick.so, libQt5QuickTest.so, libQt5Script.so,
-          libQt5ScriptTools.so, libQt5Sensors.so, libQt5SerialPort.so,
-          libQt5Sql.so, libQt5Svg.so, libQt5Test.so, libQt5UiTools.a,
-          libQt5WebKit.so, libQt5WebKitWidgets.so, libQt5WebSockets.so,
-          libQt5Widgets.so, libQt5X11Extras.so, libQt5XmlPatterns.so,
-          libQt5Xml.so, and several plugins under /opt/qt5/{imports,plugins,qml}
-        </seg>
-        <seg>
-          /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>
-
-    <variablelist>
-      <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 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 designer-qt5">
-            <primary sortas="b-designer-qt5">designer</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 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 a Qt project
-            file and produces message files used by the application.
-          </para>
-          <indexterm zone="qt5 lrelease-qt5">
-            <primary sortas="b-lrelease-qt5">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt5">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and produces or updates the translation
-            files listed in the project file.
-          </para>
-          <indexterm zone="qt5 lupdate-qt5">
-            <primary sortas="b-lupdate-qt5">lupdate</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 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 pixeltool-qt5">
-            <primary sortas="b-pixeltool-qt5">pixeltool</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 qmake-qt5">
-            <primary sortas="b-qmake-qt5">qmake</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 rcc-qt5">
-            <primary sortas="b-rcc-qt5">rcc</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 uic-qt5">
-            <primary sortas="b-uic-qt5">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
