[blfs-book] r10436 - in trunk/BOOK: . general/genlib general/genutils general/graphlib general/prog general/sysutils kde4/core multimedia/videoutils networking/netutils server/other x/lib xsoft/other

rthomsen at linuxfromscratch.org rthomsen at linuxfromscratch.org
Sat Jul 21 09:40:57 PDT 2012


Author: rthomsen
Date: 2012-07-21 10:40:52 -0600 (Sat, 21 Jul 2012)
New Revision: 10436

Added:
   trunk/BOOK/x/lib/qt.xml
Removed:
   trunk/BOOK/x/lib/qt4.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/libdbusmenuqt.xml
   trunk/BOOK/general/genlib/qca.xml
   trunk/BOOK/general/genutils/graphviz.xml
   trunk/BOOK/general/genutils/pinentry.xml
   trunk/BOOK/general/graphlib/poppler.xml
   trunk/BOOK/general/prog/cmake.xml
   trunk/BOOK/general/prog/doxygen.xml
   trunk/BOOK/general/sysutils/strigi.xml
   trunk/BOOK/kde4/core/attica.xml
   trunk/BOOK/kde4/core/automoc4.xml
   trunk/BOOK/kde4/core/kde4workspace.xml
   trunk/BOOK/kde4/core/phonon.xml
   trunk/BOOK/kde4/core/qimageblitz.xml
   trunk/BOOK/multimedia/videoutils/vlc.xml
   trunk/BOOK/networking/netutils/avahi.xml
   trunk/BOOK/server/other/soprano.xml
   trunk/BOOK/x/lib/cairo.xml
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/xsoft/other/gnash.xml
   trunk/BOOK/xsoft/other/transmission.xml
Log:
Change Qt4 to just Qt in xml filename and references.

Modified: trunk/BOOK/general/genlib/libdbusmenuqt.xml
===================================================================
--- trunk/BOOK/general/genlib/libdbusmenuqt.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/genlib/libdbusmenuqt.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -69,7 +69,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/>
+    <xref linkend="qt"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/general/genlib/qca.xml
===================================================================
--- trunk/BOOK/general/genlib/qca.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/genlib/qca.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -71,7 +71,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/> and
+    <xref linkend="qt"/> and
     <xref linkend="which"/>
     </para>
 

Modified: trunk/BOOK/general/genutils/graphviz.xml
===================================================================
--- trunk/BOOK/general/genutils/graphviz.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/genutils/graphviz.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -110,7 +110,7 @@
       <ulink url="http://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>,
       <xref linkend="gs"/>,
       <xref linkend="gtk2"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="qt"/>
     </para>
 
     <bridgehead renderas="sect4">Optional (To Build Language Bindings)</bridgehead>

Modified: trunk/BOOK/general/genutils/pinentry.xml
===================================================================
--- trunk/BOOK/general/genutils/pinentry.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/genutils/pinentry.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -79,7 +79,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><!-- <xref linkend="GTK"/>, -->
     <xref linkend="gtk2"/>,
-    <!-- <xref linkend="qt"/> or --><xref linkend="qt4"/>, and
+    <xref linkend="qt"/>, and
     <xref linkend="libcap2"/></para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/graphlib/poppler.xml
===================================================================
--- trunk/BOOK/general/graphlib/poppler.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/graphlib/poppler.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -128,7 +128,7 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="openjpeg"/> and
-      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
+      <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
       is needed for PDF support in <application>Okular</application>).
     </para>
 

Modified: trunk/BOOK/general/prog/cmake.xml
===================================================================
--- trunk/BOOK/general/prog/cmake.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/prog/cmake.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="subversion"/> (for testing) and
-      <xref linkend="qt4"/> (for the Qt-based GUI)
+      <xref linkend="qt"/> (for the Qt-based GUI)
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/general/prog/doxygen.xml
===================================================================
--- trunk/BOOK/general/prog/doxygen.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/prog/doxygen.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -73,7 +73,7 @@
     <bridgehead renderas="sect3">Doxygen Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="qt4"/> (for doxywizard),
+    <para role="optional"><xref linkend="qt"/> (for doxywizard),
     <xref linkend="graphviz"/>,
     <xref linkend="python2"/>,
     <!--<xref linkend="tetex"/> or--> <xref linkend="texlive"/>,
@@ -87,12 +87,6 @@
   <sect2 role="installation">
     <title>Installation of Doxygen</title>
 
-<!--
-    <note><para>If you have both <xref linkend='qt'/> and <xref linkend='qt4'/>
-    installed, be sure to set the environment variable QTDIR to point to the
-    <application>Qt</application> top level directory if you add the
-    <option>- -with-doxywizard</option> option.</para></note> -->
-
     <para>Install <application>Doxygen</application> by running the following
     commands:</para>
 

Modified: trunk/BOOK/general/sysutils/strigi.xml
===================================================================
--- trunk/BOOK/general/sysutils/strigi.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general/sysutils/strigi.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -73,7 +73,7 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="qt4"/> and
+    <xref linkend="qt"/> and
     <xref linkend="dbus"/>    
     </para>
 

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/general.ent	2012-07-21 16:40:52 UTC (rev 10436)
@@ -688,8 +688,7 @@
 <!ENTITY notification-daemon-version  "0.7.5">
 <!ENTITY pango-version                "1.30.1">
 <!ENTITY pangomm-version              "2.28.4">
-<!-- <!ENTITY qt-version                   "3.3.8d"> -->
-<!ENTITY qt4-version                  "4.8.2">
+<!ENTITY qt-version                   "4.8.2">
 <!ENTITY shared-mime-info-version     "1.0">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.8.1">

Modified: trunk/BOOK/kde4/core/attica.xml
===================================================================
--- trunk/BOOK/kde4/core/attica.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/kde4/core/attica.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -70,7 +70,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/>
+    <xref linkend="qt"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/kde4/core/automoc4.xml
===================================================================
--- trunk/BOOK/kde4/core/automoc4.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/kde4/core/automoc4.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
     <xref linkend="cmake"/> and
-    <xref linkend="qt4"/>
+    <xref linkend="qt"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/kde4/core/kde4workspace.xml
===================================================================
--- trunk/BOOK/kde4/core/kde4workspace.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/kde4/core/kde4workspace.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -109,7 +109,7 @@
   <sect2 role="installation">
     <title>Installation of Kde-workspace</title>
 
-    <para>Install <application>Kde4-workspace</application> by running the following
+    <para>Install <application>Kde-workspace</application> by running the following
     commands:</para>
 
 <screen><userinput>mkdir build &&

Modified: trunk/BOOK/kde4/core/phonon.xml
===================================================================
--- trunk/BOOK/kde4/core/phonon.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/kde4/core/phonon.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -89,7 +89,7 @@
   <sect2 role="installation">
     <title>Installation of Phonon</title>
 
-    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
+    <para>Make sure that <xref linkend="qt"/> is compiled without the bundled
     <application>Phonon</application> library. This package provides
     a better implementation.</para>
     
@@ -118,14 +118,6 @@
 
   </sect2>
 
-<!-- this is a patch slackware uses. Cannot see that we need it too
-       <para>Execute a modification to enable <ulink url="http://www.riverbankcomputing.com/software/pyqt/">pyQT4</ulink>
-       to find the headers:</para>
-       
-<screen><userinput>sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' \
-          &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
--->
-
 <!--
   <sect2 role="commands">
     <title>Command Explanations</title>

Modified: trunk/BOOK/kde4/core/qimageblitz.xml
===================================================================
--- trunk/BOOK/kde4/core/qimageblitz.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/kde4/core/qimageblitz.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -70,7 +70,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/>
+    <xref linkend="qt"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -89,8 +89,8 @@
       <xref linkend="ffmpeg"/>,
       <xref linkend="libmad"/>,
       <xref linkend="liba52"/> and
-      <xref linkend="qt4"/> (<application>Qt4</application> is required for the
-      graphical user interface. Without Qt4 you will only be able to use the
+      <xref linkend="qt"/> (<application>Qt</application> is required for the
+      graphical user interface. Without Qt you will only be able to use the
       command line or <application>ncurses</application> interface)
     </para>
 
@@ -281,7 +281,7 @@
         <listitem>
           <para>
             is a script to run <application>VLC</application> with the
-            <application>QT4</application> interface.
+            <application>Qt</application> interface.
           </para>
           <indexterm zone="vlc qvlc">
             <primary sortas="b-qvlc">qvlc</primary>

Modified: trunk/BOOK/networking/netutils/avahi.xml
===================================================================
--- trunk/BOOK/networking/netutils/avahi.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/networking/netutils/avahi.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -90,7 +90,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="qt4"/>
+      <xref linkend="qt"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/server/other/soprano.xml
===================================================================
--- trunk/BOOK/server/other/soprano.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/server/other/soprano.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -72,7 +72,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
     <xref linkend="cmake"/>, 
-    <xref linkend="qt4"/>, 
+    <xref linkend="qt"/>, 
     <xref linkend="dbus"/> and
     <xref linkend="redland"/>
     </para>

Modified: trunk/BOOK/x/lib/cairo.xml
===================================================================
--- trunk/BOOK/x/lib/cairo.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/x/lib/cairo.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -125,7 +125,7 @@
       testing the PDF backend),
       <xref linkend="mesalib"/>,
       <xref linkend="poppler"/> (for testing the PDF backend),
-      <xref linkend="qt4"/>,
+      <xref linkend="qt"/>,
       <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
       <ulink url="http://www.valgrind.org">Valgrind</ulink>.
     </para>

Modified: trunk/BOOK/x/lib/lib.xml
===================================================================
--- trunk/BOOK/x/lib/lib.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/x/lib/lib.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -50,7 +50,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
   <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="qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.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="webkitgtk.xml"/>

Copied: trunk/BOOK/x/lib/qt.xml (from rev 10434, trunk/BOOK/x/lib/qt4.xml)
===================================================================
--- trunk/BOOK/x/lib/qt.xml	                        (rev 0)
+++ trunk/BOOK/x/lib/qt.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -0,0 +1,487 @@
+<?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 qt-download-http "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt-version;.tar.gz">
+  <!ENTITY qt-download-ftp  " ">
+  <!ENTITY qt-md5sum        "3c1146ddf56247e16782f96910a8423b">
+  <!ENTITY qt-size          "228 MB">
+  <!ENTITY qt-buildsize     "1.8 GB (full), 619 (essential)">
+  <!ENTITY qt-time          "69 SBU (full), 54 SBU (essential)">
+]>
+
+<sect1 id="qt" xreflabel="Qt-&qt-version;">
+  <?dbhtml filename="qt.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Qt-&qt-version;</title>
+
+  <indexterm zone="qt">
+    <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>
+
+    &lfs71_checked;    
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &qt-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &qt-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &qt-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &qt-time;</para>
+      </listitem>
+    </itemizedlist>
+
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>GLib 2.32 patch: <ulink
+	url="&patch-root;/qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch"/>
+        </para>
+       </listitem>
+    </itemizedlist>
+
+    
+    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="x-window-system"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="dbus"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libmng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="pkgconfig"/> (needed to use D-Bus, GLib, GTK and PulseAudio)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <!--<xref linkend="nas"/>,-->
+      <xref linkend="gst-plugins-base"/>,
+      <xref linkend='pulseaudio'/>,
+      <xref linkend='glib2'/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="cups"/>,
+      <xref linkend="mysql"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="unixodbc"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/qt"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Qt</title>
+
+    <para>There are several ways to install a complicated package such as
+    <application>Qt</application>. The files are not completely position
+    independent. Installation procedures execute the program
+    <command>pkg-config</command> to determine the location of package
+    executables, libraries, headers, and other files. For
+    <application>Qt</application>, <command>pkg-config</command> will look
+    for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files which
+    must be modified if relocating the package. These files are set up correctly
+    by the build process.</para>
+
+    <para>The default installation places the files in
+    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
+    distributions place the files in the system's
+    <filename class='directory'>/usr</filename> hierarchy. The package can
+    also be installed in an arbitrary directory.</para>
+
+    <para>The advantage of installing in 
+    <filename class='directory'>/usr</filename> is that no updates to the
+    <filename>/etc/ld.so.conf</filename> or
+    <filename>/etc/man_db.conf</filename> files are required. The package
+    files are distributed within several subdirectories of the
+    <filename class='directory'>/usr</filename> hierarchy.
+    This is the method that most commercial distributions use.</para>
+
+    <caution>
+      <para>If <application>Qt</application> is being reinstalled and the
+      <filename class='directory'>/usr</filename>
+      directory is used as the prefix, run the following commands from a
+      console or non-Qt based window manager.  It overwrites
+      <application>Qt</application> libraries that should not be in use during
+      the install process.</para>
+    </caution>
+
+    <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>The method recommended by the <application>Qt</application>
+    developers does not use the /usr directory prefix. It has the advantage of
+    keeping 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.</para>
+
+    <para>The <application>Qt</application> developers use a default location
+    of <filename class='directory'>/usr/local/qt/</filename>, however the
+    procedure below puts the files in <filename
+    class='directory'>/opt/qt-&qt-version;/</filename>
+    and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
+    
+    <para>Configure <application>Qt</application> by running the
+    following commands:</para>
+
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch &&
+sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
+./configure -prefix /opt/qt-&qt-version;  \
+            -release               \
+            -nomake examples       \
+            -nomake demos          \
+            -system-sqlite         \
+            -no-nis                \
+	    -opensource            \
+	    -confirm-license &&
+make</userinput></screen>
+    
+    <note><title>Phonon</title>
+    <para>If <application>KDE</application> is intended to be installed, add
+    <option>-no-phonon</option> to the <command>./configure</command> command
+    above. While installing <application>KDE</application>, a separate version of the
+    <application>Phonon</application> libraries will be installed which better
+    matches the needs of the <application>KDE</application> desktop.</para></note>
+           
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>If you installed <application>Qt</application> in the /opt directory,
+    again as the <systemitem class="username">root</systemitem> user issue:</para>
+
+<screen role="root"><userinput>ln -svfn qt-&qt-version; /opt/qt</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>patch -Np1 -i qt-everywhere-...</command>:
+    The patch fixes compiling with <application>GLib</application> 2.32.</para>
+    
+    <para><command>sed -i '/-Werror/d'...</command>:
+    This sed prevents some compiler warnings being treated as errors when 
+    compiling with <application>GCC</application> 4.7. You can omit it if
+    you are compiling with older <application>GCC</application> versions.
+    </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 <application>Qt</application> developer.</para>
+    
+    <para><parameter>-system-sqlite</parameter>:
+    Use the system version of <application>SQLite</application>.</para>
+    
+    <para><parameter>-no-nis</parameter>:
+    Disable support for Network Information Service (NIS).</para>
+    
+    <para><parameter>-opensource</parameter>:
+    Install the opensource version of <application>Qt</application>.</para>
+    
+    <para><parameter>-confirm-license</parameter>:
+    Accept license without prompting user during configuration.</para>
+
+    <para><parameter>-plugin-sql-<replaceable><driver></replaceable></parameter>
+    or <parameter>-qt-sql-<replaceable><driver></replaceable></parameter>:
+    These switches build SQL support into the <application>Qt</application>
+    libraries.</para>
+
+    <note>
+      <para>To check if <application>mysql</application> is autodetected
+      properly, examine the output of <command>./configure -qt-sql-mysql
+      -help</command>. Other database support will require similar
+      <command>configure</command> parameters.</para>
+    </note>
+    
+    <para>There are several optional directories that can be specified in the
+    <command>./configure</command> line.  These include
+    <option>-bindir</option>, <option>-libdir</option>,
+    <option>-docdir</option>, and <option>-headerdir</option>.  For a complete
+    list, run <command>./configure -help</command>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Qt</title>
+
+    <sect3 id='qt-config'>
+      <title>Configuration Information</title>
+
+      <para>If you installed <application>Qt</application> in a location other
+      than /usr, you also 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 >> /etc/ld.so.conf << "EOF"
+<literal># Begin Qt addition
+
+/opt/qt/lib
+
+# End Qt addition</literal>
+EOF
+ldconfig</userinput></screen>
+
+      <indexterm zone="qt qt-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/qt.sh</filename> file:</para>
+
+<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << "EOF"
+<literal># Begin /etc/profile.d/qt.sh
+
+QTDIR=/opt/qt
+
+pathappend /opt/qt/bin           PATH
+pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
+
+export QTDIR
+
+# End /etc/profile.d/qt.sh</literal>
+EOF</userinput></screen>
+      
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>assistant, assistant_adp, designer, lconvert, linguist, lrelease,
+        lupdate, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
+        qdbusviewer, qdbusxml2cpp, qhelpconverter, qhelpgenerator,qmake,
+        qt3to4, qtconfig, qtdemo, rcc, uic, uic3 and xmlpatterns</seg>
+
+        <seg>libphonon.so, libQt3Support.so, libQtAssistantClient.so,
+        libQtCLucene.so, libQtCore.so, libQtDesigner.so, libQtDBus.so,
+        libQtDesignerComponents.so, libQtGui.so, libQtHelp.so, libQtNetwork.so,
+        libQtOpenGL.so, libQtScript.so, libQtScriptTools.so, libQtSql.so,
+        libQtSvg.so, libQtTest.so, libQtUiTools.a, libQtWebKit.so, libQtXml.so,
+        libQtXmlPatterns.so and numerous plugin modules installed in
+        <filename class='directory'>/opt/qt/plugins</filename></seg>
+
+        <seg>/opt/qt-&qt-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qt-assistant">
+        <term><command>assistant</command></term>
+        <listitem>
+          <para>is a tool for presenting on-line documentation.</para>
+          <indexterm zone="qt qt-assistant">
+            <primary sortas="b-assistant">assistant</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-designer">
+        <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="qt qt-designer">
+            <primary sortas="b-designer">designer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-linguist">
+        <term><command>linguist</command></term>
+        <listitem>
+          <para>provides support for translating applications into
+          local languages.</para>
+          <indexterm zone="qt qt-linguist">
+            <primary sortas="b-linguist">linguist</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-lrelease">
+        <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="qt qt-lrelease">
+            <primary sortas="b-lrelease">lrelease</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-lupdate">
+        <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="qt qt-lupdate">
+            <primary sortas="b-lupdate">lupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-moc">
+        <term><command>moc</command></term>
+        <listitem>
+          <para>generates Qt meta object support code.</para>
+          <indexterm zone="qt qt-moc">
+            <primary sortas="b-moc">moc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-pixeltool">
+        <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="qt qt-pixeltool">
+            <primary sortas="b-pixeltool">pixeltool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-qmake">
+        <term><command>qmake</command></term>
+        <listitem>
+          <para>qmake uses information stored in project files to
+          determine what should go in the makefiles it generates.</para>
+          <indexterm zone="qt qt-qmake">
+            <primary sortas="b-qmake">qmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-qt3to4">
+        <term><command>qt3to4</command></term>
+        <listitem>
+          <para>qt3to4 is a tool to help update Qt3 code to Qt4.</para>
+          <indexterm zone="qt qt-qt3to4">
+            <primary sortas="b-qt3to4">qt3to4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-qtconfig">
+        <term><command>qtconfig</command></term>
+        <listitem>
+          <para>is used to customize the appearance of Qt applications.</para>
+          <indexterm zone="qt qt-qtconfig">
+            <primary sortas="b-qtconfig">qtconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-qtdemo">
+        <term><command>qtdemo</command></term>
+        <listitem>
+          <para>is a portal into various demonstrations of Qt
+          applications.</para>
+          <indexterm zone="qt qt-qtdemo">
+            <primary sortas="b-qtdemo">qtdemo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-rcc">
+        <term><command>rcc</command></term>
+        <listitem>
+          <para>is a resource compiler used in conjunction with designer.</para>
+          <indexterm zone="qt qt-rcc">
+            <primary sortas="b-rcc">rcc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-uic">
+        <term><command>uic</command></term>
+        <listitem>
+          <para>is a Qt user interface compiler.</para>
+          <indexterm zone="qt qt-uic">
+            <primary sortas="b-uic">uic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qt-uic3">
+        <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="qt qt-uic3">
+            <primary sortas="b-uic3">uic3</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Deleted: trunk/BOOK/x/lib/qt4.xml
===================================================================
--- trunk/BOOK/x/lib/qt4.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/x/lib/qt4.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -1,487 +0,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://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-download-ftp  " ">
-  <!ENTITY qt4-md5sum        "3c1146ddf56247e16782f96910a8423b">
-  <!ENTITY qt4-size          "228 MB">
-  <!ENTITY qt4-buildsize     "1.8 GB (full), 619 (essential)">
-  <!ENTITY qt4-time          "69 SBU (full), 54 SBU (essential)">
-]>
-
-<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-qt4">Qt4</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>
-
-    &lfs71_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">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>GLib 2.32 patch: <ulink
-	url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch"/>
-        </para>
-       </listitem>
-    </itemizedlist>
-
-    
-    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dbus"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="pkgconfig"/> (needed to use D-Bus, GLib, GTK and PulseAudio)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="nas"/>,-->
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend='pulseaudio'/>,
-      <xref linkend='glib2'/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="mysql"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="unixodbc"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qt4"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <para>There are several ways to install a complicated package such as
-    <application>Qt</application>. The files are not completely position
-    independent. Installation procedures execute the program
-    <command>pkg-config</command> to determine the location of package
-    executables, libraries, headers, and other files. For
-    <application>Qt</application>, <command>pkg-config</command> will look
-    for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files which
-    must be modified if relocating the package. These files are set up correctly
-    by the build process.</para>
-
-    <para>The default installation places the files in
-    <filename class='directory'>/usr/local/qt/</filename>. Many commercial
-    distributions place the files in the system's
-    <filename class='directory'>/usr</filename> hierarchy. The package can
-    also be installed in an arbitrary directory.</para>
-
-    <para>The advantage of installing in 
-    <filename class='directory'>/usr</filename> is that no updates to the
-    <filename>/etc/ld.so.conf</filename> or
-    <filename>/etc/man_db.conf</filename> files are required. The package
-    files are distributed within several subdirectories of the
-    <filename class='directory'>/usr</filename> hierarchy.
-    This is the method that most commercial distributions use.</para>
-
-    <caution>
-      <para>If <application>Qt</application> is being reinstalled and the
-      <filename class='directory'>/usr</filename>
-      directory is used as the prefix, run the following commands from a
-      console or non-Qt based window manager.  It overwrites
-      <application>Qt</application> libraries that should not be in use during
-      the install process.</para>
-    </caution>
-
-    <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>The method recommended by the <application>Qt</application>
-    developers does not use the /usr directory prefix. It has the advantage of
-    keeping 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.</para>
-
-    <para>The <application>Qt</application> developers use a default location
-    of <filename class='directory'>/usr/local/qt/</filename>, however the
-    procedure below puts the files in <filename
-    class='directory'>/opt/qt-&qt4-version;/</filename>
-    and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
-    
-    <para>Configure <application>Qt</application> by running the
-    following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &&
-sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
-./configure -prefix /opt/qt-&qt4-version;  \
-            -release               \
-            -nomake examples       \
-            -nomake demos          \
-            -system-sqlite         \
-            -no-nis                \
-	    -opensource            \
-	    -confirm-license &&
-make</userinput></screen>
-    
-    <note><title>Phonon</title>
-    <para>If <application>KDE</application> is intended to be installed, add
-    <option>-no-phonon</option> to the <command>./configure</command> command
-    above. While installing <application>KDE</application>, a separate version of the
-    <application>Phonon</application> libraries will be installed which better
-    matches the needs of the <application>KDE</application> desktop.</para></note>
-           
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>If you installed <application>Qt</application> in the /opt directory,
-    again as the <systemitem class="username">root</systemitem> user issue:</para>
-
-<screen role="root"><userinput>ln -svfn qt-&qt4-version; /opt/qt</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>patch -Np1 -i qt-everywhere-...</command>:
-    The patch fixes compiling with <application>GLib</application> 2.32.</para>
-    
-    <para><command>sed -i '/-Werror/d'...</command>:
-    This sed prevents some compiler warnings being treated as errors when 
-    compiling with <application>GCC</application> 4.7. You can omit it if
-    you are compiling with older <application>GCC</application> versions.
-    </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 <application>Qt</application> developer.</para>
-    
-    <para><parameter>-system-sqlite</parameter>:
-    Use the system version of <application>SQLite</application>.</para>
-    
-    <para><parameter>-no-nis</parameter>:
-    Disable support for Network Information Service (NIS).</para>
-    
-    <para><parameter>-opensource</parameter>:
-    Install the opensource version of <application>Qt</application>.</para>
-    
-    <para><parameter>-confirm-license</parameter>:
-    Accept license without prompting user during configuration.</para>
-
-    <para><parameter>-plugin-sql-<replaceable><driver></replaceable></parameter>
-    or <parameter>-qt-sql-<replaceable><driver></replaceable></parameter>:
-    These switches build SQL support into the <application>Qt</application>
-    libraries.</para>
-
-    <note>
-      <para>To check if <application>mysql</application> is autodetected
-      properly, examine the output of <command>./configure -qt-sql-mysql
-      -help</command>. Other database support will require similar
-      <command>configure</command> parameters.</para>
-    </note>
-    
-    <para>There are several optional directories that can be specified in the
-    <command>./configure</command> line.  These include
-    <option>-bindir</option>, <option>-libdir</option>,
-    <option>-docdir</option>, and <option>-headerdir</option>.  For a complete
-    list, run <command>./configure -help</command>.</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 a location other
-      than /usr, you also 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 >> /etc/ld.so.conf << "EOF"
-<literal># Begin Qt addition
-
-/opt/qt/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/qt.sh</filename> file:</para>
-
-<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << "EOF"
-<literal># Begin /etc/profile.d/qt.sh
-
-QTDIR=/opt/qt
-
-pathappend /opt/qt/bin           PATH
-pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
-
-export QTDIR
-
-# End /etc/profile.d/qt.sh</literal>
-EOF</userinput></screen>
-      
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>assistant, assistant_adp, designer, lconvert, linguist, lrelease,
-        lupdate, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-        qdbusviewer, qdbusxml2cpp, qhelpconverter, qhelpgenerator,qmake,
-        qt3to4, qtconfig, qtdemo, rcc, uic, uic3 and xmlpatterns</seg>
-
-        <seg>libphonon.so, libQt3Support.so, libQtAssistantClient.so,
-        libQtCLucene.so, libQtCore.so, libQtDesigner.so, libQtDBus.so,
-        libQtDesignerComponents.so, libQtGui.so, libQtHelp.so, libQtNetwork.so,
-        libQtOpenGL.so, libQtScript.so, libQtScriptTools.so, libQtSql.so,
-        libQtSvg.so, libQtTest.so, libQtUiTools.a, libQtWebKit.so, libQtXml.so,
-        libQtXmlPatterns.so and numerous plugin modules installed in
-        <filename class='directory'>/opt/qt/plugins</filename></seg>
-
-        <seg>/opt/qt-&qt4-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qt4-assistant">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>is a tool for presenting on-line documentation.</para>
-          <indexterm zone="qt4 qt4-assistant">
-            <primary sortas="b-assistant">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-designer">
-        <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 qt4-designer">
-            <primary sortas="b-designer">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-linguist">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>provides support for translating applications into
-          local languages.</para>
-          <indexterm zone="qt4 qt4-linguist">
-            <primary sortas="b-linguist">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-lrelease">
-        <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 qt4-lrelease">
-            <primary sortas="b-lrelease">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-lupdate">
-        <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 qt4-lupdate">
-            <primary sortas="b-lupdate">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-moc">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>generates Qt meta object support code.</para>
-          <indexterm zone="qt4 qt4-moc">
-            <primary sortas="b-moc">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-pixeltool">
-        <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 qt4-pixeltool">
-            <primary sortas="b-pixeltool">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-qmake">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>qmake uses information stored in project files to
-          determine what should go in the makefiles it generates.</para>
-          <indexterm zone="qt4 qt4-qmake">
-            <primary sortas="b-qmake">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-qt3to4">
-        <term><command>qt3to4</command></term>
-        <listitem>
-          <para>qt3to4 is a tool to help update Qt3 code to Qt4.</para>
-          <indexterm zone="qt4 qt4-qt3to4">
-            <primary sortas="b-qt3to4">qt3to4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-qtconfig">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>is used to customize the appearance of Qt applications.</para>
-          <indexterm zone="qt4 qt4-qtconfig">
-            <primary sortas="b-qtconfig">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-qtdemo">
-        <term><command>qtdemo</command></term>
-        <listitem>
-          <para>is a portal into various demonstrations of Qt
-          applications.</para>
-          <indexterm zone="qt4 qt4-qtdemo">
-            <primary sortas="b-qtdemo">qtdemo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-rcc">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>is a resource compiler used in conjunction with designer.</para>
-          <indexterm zone="qt4 qt4-rcc">
-            <primary sortas="b-rcc">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-uic">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>is a Qt user interface compiler.</para>
-          <indexterm zone="qt4 qt4-uic">
-            <primary sortas="b-uic">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt4-uic3">
-        <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 qt4-uic3">
-            <primary sortas="b-uic3">uic3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/xsoft/other/gnash.xml
===================================================================
--- trunk/BOOK/xsoft/other/gnash.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/xsoft/other/gnash.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -93,7 +93,7 @@
       <xref linkend="git"/>,
       <xref linkend="libogg"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="qt4"/>,
+      <xref linkend="qt"/>,
       <xref linkend="speex"/>,
       <xref linkend="wget"/>,
       <ulink url="http://www.swftools.org/">SWFTools</ulink>,

Modified: trunk/BOOK/xsoft/other/transmission.xml
===================================================================
--- trunk/BOOK/xsoft/other/transmission.xml	2012-07-21 16:25:13 UTC (rev 10435)
+++ trunk/BOOK/xsoft/other/transmission.xml	2012-07-21 16:40:52 UTC (rev 10436)
@@ -88,7 +88,7 @@
       <xref linkend="gtk2"/> or
       <xref linkend="gtk3"/> (if both Gtk+ 2 and Gtk+ 3 are installed, configure
       defaults to using Gtk+ 3), or
-      <xref linkend="qt4"/>.
+      <xref linkend="qt"/>.
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -113,7 +113,7 @@
 make</userinput></screen>
 
     <para>
-      If you have installed <xref linkend="qt4"/> and would like to compile the
+      If you have installed <xref linkend="qt"/> and would like to compile the
       Qt GUI:
     </para>
 




More information about the blfs-book mailing list