Index: x/lib/qt/qt-config.xml
===================================================================
--- x/lib/qt/qt-config.xml	(revision ee548affd8e53f656bbc9aa8c1744c764ecbf34e)
+++ x/lib/qt/qt-config.xml	(revision fff069fee476acc52f95aa365739a844ef238588)
@@ -4,40 +4,7 @@
 <sect3><title>Configuration Information</title>
 
-<para>As with most libraries, there is no configuration to do, save that
-the library directory <filename class="directory">/opt/qt/lib</filename> should appear
-in <filename>/etc/ld.so.conf</filename> so that ldd can find the
-shared libraries. The following command will add it if it is missing:</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</command>
-# Begin qt addition to /etc/ld.so.conf
-
-/opt/qt/lib
-
-# End qt addition
-<command>EOF
-ldconfig</command></userinput></screen>
-
-<para>You need to add the path for the <application>Qt</application> man pages to the
-<filename>man.conf</filename>
-file.  This can be done with the following command:</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</command>
-# Begin qt addition to man.conf
-
-MANPATH /opt/qt/doc/man
-
-# End qt addition to man.conf
-<command>EOF</command></userinput></screen>
-
-<para>Most of the <application>Qt</application> based applications (such as
-<application>KDE</application>) require the <envar>QTDIR</envar> to be
-set during compilation. This can be achieved by the following command.
-For convenience, this command may be added to <filename>/etc/profile</filename>
-or <filename>$HOME/.bash_profile</filename>.</para>
-
-<screen><userinput><command>export QTDIR=/opt/qt</command></userinput></screen>
+&library-config;
 
 </sect3>
 
 </sect2>
-
Index: x/lib/qt/qt-desc.xml
===================================================================
--- x/lib/qt/qt-desc.xml	(revision ee548affd8e53f656bbc9aa8c1744c764ecbf34e)
+++ x/lib/qt/qt-desc.xml	(revision fff069fee476acc52f95aa365739a844ef238588)
@@ -23,6 +23,5 @@
 <para>The <application>Qt</application>/<application>X11</application>
 library contains <acronym>API</acronym>'s necessary to use
-<application><acronym>KDE</acronym></application>
-programs.</para></sect3>
+programs based on Qt <acronym>GUI</acronym> toolkit.</para></sect3>
 
 </sect2>
Index: x/lib/qt/qt-exp.xml
===================================================================
--- x/lib/qt/qt-exp.xml	(revision ee548affd8e53f656bbc9aa8c1744c764ecbf34e)
+++ x/lib/qt/qt-exp.xml	(revision fff069fee476acc52f95aa365739a844ef238588)
@@ -1,54 +1,51 @@
 <sect2>
 <title>Command explanations</title>
+
+<para><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf</command>:
+<command>install</command> is safer than <command>cp</command> when
+libraries are in use.</para>
 
 <para><command>bash</command>: This command enters a sub-shell to isolate 
 environment changes.</para>
 
-<para><command>export QTDIR=$PWD</command>: This command defines where the
-root of the <application>Qt</application> directory is located.</para>
-
-<para><command>export LD_LIBRARY_PATH=$QTDIR/lib</command>: This command 
+<para><command>export LD_LIBRARY_PATH=$PWD/lib</command>: This command 
 sets up the location of libraries for the build process.</para>
 
-<para><command>export PATH=$QTDIR/bin:$PATH</command>: This command 
+<para><command>export PATH=$PWD/bin:$PATH</command>: This command 
 allows the build process to find supporting executables.</para>
 
-<para><parameter>-prefix /opt/qt-&qt-version;</parameter>: This command sets up
-the install destination.</para>
-
-<para><option>-qt-gif</option>: This command adds support for gif
+<para><parameter>-qt-gif</parameter>: This switch adds support for gif
 files to the libraries.</para>
 
-<para><option>-system-libpng -system-libmng -system-zlib
--system-libjpeg</option>: This command forces the library to use the
-shared libraries that are on your system instead of recreating its own
-set of support libraries for these functions.</para>
+<para><parameter>-system-zlib -system-libpng</parameter>: This switch
+forces the library to use the shared libraries that are on your system
+instead of recreating its own set of support libraries for these
+functions.</para>
 
-<para><option>-no-g++-exceptions</option>: This command disables
+<para><parameter>-no-g++-exceptions</parameter>: This switch disables
 the exceptions coding generated by the <application>C++</application> compiler.</para>
 
-<para><option>-thread</option>: This command compiles the library
-to support multi-threading.</para>
+<para><parameter>-thread</parameter>: This switch adds
+support for multi-threading.</para>
 
-<para><command>ln -sfn qt-&qt-version; /opt/qt</command>: This command
-standardizes the location of the <application>Qt</application> libraries
-to the <filename>ld.so.conf</filename> entry
-described below.</para>
+<para><command>find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g"</command>:
+This command removes hardcoded run-time path, else
+<command>uic</command> tries to run with system installed Qt
+libraries.</para>
 
-<para><command>ln -s libqt-mt.so /opt/qt/lib/libqt.so</command>: This
+<para><command>ln -s libqt-mt.so /usr/lib/libqt.so</command>: This
 command allows configure scripts
 to find a working <application>Qt</application> installation.</para>
 
-<para><command>cp -r doc/man /opt/qt/doc</command>: This command
-installs the man directory which is missed by <command>make
+<para><command>cp -r doc/man /usr/share</command>: This command
+installs the man pages which are missed by <command>make
 install</command>.</para>
 
-<para><command>cp -r examples /opt/qt/doc</command>: This command
-installs the examples directory which is missed by <command>make
+<para><command>cp -r examples /usr/share/doc/qt</command>: This command
+installs the examples which are missed by <command>make
 install</command>.</para>
 
 <para><command>exit</command>: This command returns to the parent shell
-and eliminates envirnment variables set earlier.</para>
+and eliminates environment variables set earlier.</para>
 
 </sect2>
-
Index: x/lib/qt/qt-inst.xml
===================================================================
--- x/lib/qt/qt-inst.xml	(revision ee548affd8e53f656bbc9aa8c1744c764ecbf34e)
+++ x/lib/qt/qt-inst.xml	(revision fff069fee476acc52f95aa365739a844ef238588)
@@ -2,17 +2,22 @@
 <title>Installation of <application>Qt</application></title>
 
-<screen><userinput><command>bash
-export QTDIR=$PWD &amp;&amp;
-export LD_LIBRARY_PATH=$QTDIR/lib &amp;&amp;
-export PATH=$QTDIR/bin:$PATH &amp;&amp;
-./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
-&nbsp;&nbsp;&nbsp;-system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
-&nbsp;&nbsp;&nbsp;-thread &amp;&amp;
+<para>Install <application>Qt</application> by running the following
+commands:</para>
+
+<screen><userinput><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf &amp;&amp;
+bash
+export PATH=$PWD/bin:$PATH &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib &amp;&amp;
+./configure -prefix /usr -docdir /usr/share/doc/qt \
+    -headerdir /usr/include/qt -plugindir /usr/lib/qt/plugins \
+    -datadir /usr/share/qt -translationdir /usr/share/qt/translations \
+    -sysconfdir /etc/qt -release -shared -qt-gif -system-zlib \
+    -no-g++-exceptions -thread -plugin-imgfmt-png -system-libpng &amp;&amp;
 make &amp;&amp;
+find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" &amp;&amp;
 make install &amp;&amp;
-ln -sfn qt-&qt-version; /opt/qt &amp;&amp;
-ln -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
-cp -r doc/man /opt/qt/doc &amp;&amp;
-cp -r examples /opt/qt/doc
+ln -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
+cp -r doc/man /usr/share &amp;&amp;
+cp -r examples /usr/share/doc/qt &amp;&amp;
 exit</command></userinput></screen>
 
@@ -27,2 +32,11 @@
 
 </sect2>
+
+<!--
+-cups
+-plugin-imgfmt-jpeg 
+-plugin-imgfmt-mng 
+-system-libjpeg
+-system-libmng
+-system-nas-sound
+-->
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision ee548affd8e53f656bbc9aa8c1744c764ecbf34e)
+++ x/lib/qt/qt-intro.xml	(revision fff069fee476acc52f95aa365739a844ef238588)
@@ -18,9 +18,18 @@
 <sect3><title><application>Qt</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="xfree86"/> and 
-<xref linkend="libmng"/></para></sect4>
+<para>
+<xref linkend="xfree86"/>
+</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="nas"/> and <xref
-linkend="cups"/></para></sect4>
+<para>
+<xref linkend="libjpeg"/>,
+<xref linkend="libmng"/>,
+<xref linkend="nas"/>,
+<xref linkend="cups"/>,
+<xref linkend="mysql"/>,
+<xref linkend="postgresql"/>,
+<ulink url="http://firebird.sourceforge.net/">Firebird</ulink> and
+<ulink url="http://www.unixodbc.org/">unixODBC</ulink>
+</para></sect4>
 </sect3>
 
