Index: general.ent
===================================================================
--- general.ent	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ general.ent	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -606,4 +606,5 @@
 <!ENTITY qt-version                   "3.3.8d">
 <!ENTITY qt4-version                  "4.8.1">
+<!ENTITY qt-dir			      "$QTDIR">
 <!ENTITY cairo-version                "1.12.0">
 <!ENTITY cairomm-version              "1.9.2">
Index: general/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ general/genlib/libdbusmenuqt.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -92,5 +92,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
       -DWITH_DOC=OFF .. &amp;&amp;
 make</userinput></screen>
@@ -122,5 +122,5 @@
         <seg>None</seg>
 	<seg>libdbusmenu-qt.so</seg>
-	<seg>$QT4DIR/include/dbusmenu-qt</seg>
+	<seg>&qt-dir;/include/dbusmenu-qt</seg>
       </seglistitem>
     </segmentedlist>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ general/genlib/qca.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -8,6 +8,6 @@
   <!ENTITY qca-download-ftp  " ">
   <!ENTITY qca-md5sum        "fc15bd4da22b8096c51fcfe52d2fa309">
-  <!ENTITY qca-size          "4.5 MB">
-  <!ENTITY qca-buildsize     "89 MB">
+  <!ENTITY qca-size          "4.3 MB">
+  <!ENTITY qca-buildsize     "110 MB">
   <!ENTITY qca-time          "2.2 SBU">
 ]>
@@ -28,12 +28,12 @@
 
   <sect2 role="package">
-    <title>Introduction to QCA</title>
+    <title>Introduction to Qca</title>
 
-    <para><application>QCA</application> aims to provide a straightforward 
-    and cross-platform crypto API, using <application>Qt4</application> datatypes 
-    and conventions. <application>QCA</application> separates the API from 
+    <para><application>Qca</application> aims to provide a straightforward 
+    and cross-platform crypto API, using <application>Qt</application> datatypes 
+    and conventions. <application>Qca</application> separates the API from 
     the implementation, using plugins known as Providers.</para>
 
-    &lfs67_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -68,5 +68,5 @@
     </itemizedlist>
 -->
-    <bridgehead renderas="sect3">qca Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -82,10 +82,11 @@
 
   <sect2 role="installation">
-    <title>Installation of QCA</title>
+    <title>Installation of Qca</title>
 
-    <para>Install <application>qca</application> by running the following
+    <para>Install <application>Qca</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix QtCore) &amp;&amp;
+<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
+./configure --prefix=&qt-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -95,24 +96,26 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
+    <para><command>sed -i '217s@set@...</command>: This sed fixes compiling with 
+    <application>GCC</application> 4.7. It is safe to omit when compiling with 
+    older <application>GCC</application> versions.</para>
 
   </sect2>
--->
+
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libqca.so</seg>
-        <seg>$QT4DIR/share/qca</seg>
+        <seg>qcatool2 and qcatool2.debug</seg>
+        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
+	<seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
       </seglistitem>
     </segmentedlist>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ general/prog/doxygen.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -91,5 +91,5 @@
     <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>Qt4</application> top level directory if you add the
+    <application>Qt</application> top level directory if you add the
     <option>- -with-doxywizard</option> option.</para></note> -->
 
@@ -123,5 +123,5 @@
 
     <para><option>--with-doxywizard</option>: Use this parameter if
-    <application>Qt4</application> is installed and you wish to build the
+    <application>Qt</application> is installed and you wish to build the
     GUI front-end.</para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ introduction/welcome/changelog.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -46,5 +46,14 @@
       <itemizedlist>
         <listitem>
-          <para>[rthomsen] - Added sed for compiling Strigi with GCC 4.7.</para>
+          <para>[rthomsen] - Replace the use of the $QT4DIR variable with 
+	  $QTDIR, since only one version of Qt is currently in the book.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Added sed for compiling Qca with GCC 4.7. Thanks 
+	  to Pierre Labastie for the report.</para>
+        </listitem>
+	<listitem>
+          <para>[rthomsen] - Added sed for compiling Strigi with GCC 4.7. Thanks 
+	  to Pierre Labastie for the report.</para>
         </listitem>
         <listitem>
Index: kde4/core/akonadi.xml
===================================================================
--- kde4/core/akonadi.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/core/akonadi.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -93,5 +93,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-CMAKE_PREFIX_PATH=$QT4DIR \
+CMAKE_PREFIX_PATH=&qt-dir; \
       cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
 make</userinput></screen>
@@ -106,5 +106,5 @@
     <title>Command Explanations</title>
 
-    <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4.</para>
+    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4.</para>
 
   </sect2>
Index: kde4/core/automoc4.xml
===================================================================
--- kde4/core/automoc4.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/core/automoc4.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -31,5 +31,5 @@
 
     <para><application>Automoc4</application> is a tool to add rules for generating 
-    <application>Qt4</application> moc files automatically to projects that use 
+    <application>Qt</application> moc files automatically to projects that use 
     <application>CMake</application> as the buildsystem.</para>
 
@@ -89,5 +89,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
       .. &amp;&amp;
 make</userinput></screen>
@@ -129,5 +129,5 @@
         <term><command>automoc4</command></term>
         <listitem>
-          <para>is a utility generating <application>Qt4</application> moc
+          <para>is a utility generating <application>Qt</application> moc
           files.</para>
           <indexterm zone="a-automoc4 automoc4">
Index: kde4/core/config.xml
===================================================================
--- kde4/core/config.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/core/config.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -70,5 +70,5 @@
     <title>Installing further KDE packages</title>
     <para>Every subsequent package can be built while having <application>KDE</application> up and 
-    running, but remember to keep <envar>&kde-dir;</envar> and <envar>$QT4DIR</envar> set.</para>
+    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt-dir;</envar> set.</para>
   </sect2>
    
Index: kde4/core/phonon.xml
===================================================================
--- kde4/core/phonon.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/core/phonon.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -99,5 +99,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
+cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
       .. &amp;&amp;
@@ -113,5 +113,7 @@
     <title>Command Explanations</title>
 
-    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: This option ensures that the plugins and mkspecs files get installed in the correct location.</para>
+    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: 
+    This option ensures that the plugins and mkspecs files get installed in 
+    the correct location.</para>
 
   </sect2>
@@ -122,5 +124,5 @@
        
 <screen><userinput>sed -i -e 's#{includedir}$#&amp; -I\${includedir}/phonon#' \
-          $QT4DIR/lib/pkgconfig/phonon.pc</userinput></screen>
+          &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
 -->
 
@@ -137,11 +139,11 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>none</seg>
-        <seg>libphonon.so, libphononexperimental.so</seg>
+        <seg>libphonon.so and libphononexperimental.so</seg>
         <seg>none</seg>
       </seglistitem>
Index: kde4/core/polkit-qt.xml
===================================================================
--- kde4/core/polkit-qt.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/core/polkit-qt.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -88,5 +88,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-CMAKE_PREFIX_PATH=$QT4DIR \
+CMAKE_PREFIX_PATH=&qt-dir; \
       cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
 make</userinput></screen>
@@ -101,5 +101,5 @@
     <title>Command Explanations</title>
 
-    <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4</para>
+    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4</para>
 
   </sect2>
Index: kde4/intro/kde4-intro.xml
===================================================================
--- kde4/intro/kde4-intro.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/intro/kde4-intro.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -18,5 +18,5 @@
   <para><application>KDE</application> version 4 is a comprehensive desktop
   environment with a huge number of applications written for it and a huge
-  amount of users. It is based on the <application>Qt4</application> framework.</para>
+  amount of users. It is based on the <application>Qt</application> framework.</para>
   <para>For more information visit the official KDE project site at <ulink
   url="http://www.kde.org/"/>.</para>
Index: kde4/intro/pre-install-config.xml
===================================================================
--- kde4/intro/pre-install-config.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ kde4/intro/pre-install-config.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -132,24 +132,4 @@
     </tip>
 
-  <!-- Moved to QT4
-  <sect2><title>The QT4DIR variable</title>
-  
-  <para>Some additional packages which are based on
-  <application>Qt4</application> will be installed. One of them is
-  <application>Phonon</application>, a direct replacement of the implementation
-  which comes with <application>Qt4</application>.  It's recommended placing
-  such libraries in the same hierarchy where <application>Qt4</application>
-  itself resides. Later on, it is refered to as <envar>QT4DIR</envar>. If you have
-  placed <application>Qt4</application> in <filename
-  class='directory'>/usr</filename>, set <envar>QT4DIR</envar>:</para>
-  
-<screen><userinput>export QT4DIR=/usr</userinput></screen>
-
-  <para>Alternativly, <application>Qt4</application> is often placed in the
-  <filename class='directory'>/opt</filename> hierarchy:</para>
-  
-<screen><userinput>export QT4DIR=/opt/qt-&qt4-version;
-export PATH=$QT4DIR/bin:$PATH</userinput></screen>
--->
   </sect2>
 </sect1>
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ networking/netutils/avahi.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -159,5 +159,5 @@
     <para><parameter>--disable-qt4</parameter>: This parameter disables the
     building of <application>Qt4Core</application> mainloop integration. Omit
-    this if you have installed <application>Qt4</application>.</para>
+    this if you have installed <application>Qt</application>.</para>
 
     <para><parameter>--enable-core-docs</parameter>: This parameter enables the
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 86f9469984383a0fe600da581752b19af6a146ff)
+++ x/lib/qt4.xml	(revision ad41452e9ffc140f08202adad91cdb4c17e1b7da)
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Qt4</title>
+    <title>Introduction to Qt</title>
 
     <para><application>Qt</application> is a cross-platform application 
@@ -35,5 +35,5 @@
     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>Qt4</application> is <application>KDE</application>.</para>
+    of <application>Qt</application> is <application>KDE</application>.</para>
 
     &lfs71_checked;    
@@ -112,12 +112,12 @@
 
   <sect2 role="installation">
-    <title>Installation of Qt4</title>
+    <title>Installation of Qt</title>
 
     <para>There are several ways to install a complicated package such as
-    <application>Qt4</application>. The files are not completely position
+    <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>Qt4</application>, <command>pkg-config</command> will look
+    <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
@@ -136,35 +136,11 @@
     <filename class='directory'>/usr</filename> hierarchy.
     This is the method that most commercial distributions use.</para>
-<!--
-    <note>
-      <para>There is no conflict between the <application>Qt3</application>
-      and <application>Qt4</application> applications and headers so both
-      can be installed at the same time.  This may be necessary to build or
-      run Qt3 applications like <application>KDE3</application> and
-      <application>Qt4</application> applications like
-      <application>Doxygen</application>'s <application>doxywizard</application>
-      on the same system.
-      </para>
-
-      <para>To set up both <application>Qt3</application> and
-      <application>Qt4</application> on the same system, choose the primary
-      version for the <filename>/opt/qt</filename> symbolic link and add
-      the explicit library directory of the other version to
-      <filename>/etc/ld.so.conf</filename>.</para>
-
-      <para>On a system with both versions of Qt, there is a name conflict with
-      Qt applications such as <filename>qmake</filename>,
-      <filename>assistant</filename>, and <filename>designer</filename>.  In
-      such a case, make sure the PATH variable lists the proper
-      <filename>/opt/qt&lt;version&gt;/bin</filename> directory before the
-      other Qt bin directory.  </para>
-    </note>
--->
+
     <caution>
-      <para>If <application>Qt4</application> is being reinstalled and the
+      <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-Qt4 based window manager.  It overwrites
-      <application>Qt4</application> libraries that should not be in use during
+      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>
@@ -172,10 +148,10 @@
     <note>
       <para>The build time and space required for the full
-      <application>Qt4</application> is quite long.  The instructions below do
+      <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>Qt4</application>
+    <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
@@ -184,5 +160,5 @@
     by changing one symbolic link.</para>
 
-    <para>The <application>Qt4</application> developers use a default location
+    <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
@@ -190,5 +166,5 @@
     and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
     
-    <para>Configure <application>Qt4</application> by running the
+    <para>Configure <application>Qt</application> by running the
     following commands:</para>
 
@@ -220,5 +196,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you installed <application>Qt4</application> in the /opt directory,
+    <para>If you installed <application>Qt</application> in the /opt directory,
     again as the <systemitem class="username">root</systemitem> user issue:</para>
 
@@ -245,5 +221,5 @@
     <para><parameter>-nomake examples, -nomake demos</parameter>:
     These switches disable building programs that are only of interest
-    to a <application>Qt4</application> developer.</para>
+    to a <application>Qt</application> developer.</para>
     
     <para><parameter>-system-sqlite</parameter>:
@@ -261,5 +237,5 @@
     <para><parameter>-plugin-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>
     or <parameter>-qt-sql-<replaceable>&lt;driver&gt;</replaceable></parameter>:
-    These switches build SQL support into the <application>Qt4</application>
+    These switches build SQL support into the <application>Qt</application>
     libraries.</para>
 
@@ -280,12 +256,12 @@
 
   <sect2 role="configuration">
-    <title>Configuring Qt4</title>
+    <title>Configuring Qt</title>
 
     <sect3 id='qt4-config'>
       <title>Configuration Information</title>
 
-      <para>If you installed <application>Qt4</application> in a location other
+      <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>Qt4</application> is correctly found by other packages
+      that <application>Qt</application> is correctly found by other packages
       and system processes.</para>
 
@@ -295,9 +271,9 @@
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin qt addition
+<literal># Begin Qt addition
 
 /opt/qt/lib
 
-# End qt addition</literal>
+# End Qt addition</literal>
 EOF
 ldconfig</userinput></screen>
@@ -308,10 +284,9 @@
 
       <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"
-# Begin /etc/profile.d/qt4.sh
-
-QT4DIR=/opt/qt
+      the <filename>/etc/profile.d/qt.sh</filename> file:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; "EOF"
+# Begin /etc/profile.d/qt.sh
+
 QTDIR=/opt/qt
 
@@ -319,7 +294,7 @@
 pathappend /opt/qt/lib/pkgconfig PKG_CONFIG_PATH
 
-export QT4DIR QTDIR
-
-# End /etc/profile.d/qt4.sh
+export QTDIR
+
+# End /etc/profile.d/qt.sh
 EOF</userinput></screen>
       
