[blfs-book] r11613 - in trunk/BOOK: . general/genutils introduction/welcome x/lib

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Sun Aug 11 11:36:44 PDT 2013


Author: krejzi
Date: Sun Aug 11 11:36:44 2013
New Revision: 11613

Log:
Add qtchooser

Added:
   trunk/BOOK/general/genutils/qtchooser.xml   (contents, props changed)
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genutils/genutils.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt4.xml
   trunk/BOOK/x/lib/qt5.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Sun Aug 11 11:19:39 2013	(r11612)
+++ trunk/BOOK/general.ent	Sun Aug 11 11:36:44 2013	(r11613)
@@ -315,6 +315,7 @@
 <!ENTITY JS-version                   "17.0.0">
 <!ENTITY libiodbc-version             "3.52.8">
 <!ENTITY pinentry-version             "0.8.3">
+<!ENTITY qtchooser-version            "31">
 <!ENTITY rarian-version               "0.8.1">
 <!ENTITY recode-version               "3.6">
 <!ENTITY rep-gtk-version              "0.90.8.1">

Modified: trunk/BOOK/general/genutils/genutils.xml
==============================================================================
--- trunk/BOOK/general/genutils/genutils.xml	Sun Aug 11 11:19:39 2013	(r11612)
+++ trunk/BOOK/general/genutils/genutils.xml	Sun Aug 11 11:36:44 2013	(r11613)
@@ -34,6 +34,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtchooser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>

Added: trunk/BOOK/general/genutils/qtchooser.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/BOOK/general/genutils/qtchooser.xml	Sun Aug 11 11:36:44 2013	(r11613)
@@ -0,0 +1,247 @@
+<?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 qtchooser-git-revision "g980c64c">
+
+  <!ENTITY qtchooser-download-http "http://macieira.org/qtchooser/qtchooser-&qtchooser-version;-&qtchooser-git-revision;.tar.gz">
+  <!ENTITY qtchooser-download-ftp  " ">
+  <!ENTITY qtchooser-md5sum        "36497558a0266dcbe4cccb6477bfc158">
+  <!ENTITY qtchooser-size          "32 KB">
+  <!ENTITY qtchooser-buildsize     "700 KB">
+  <!ENTITY qtchooser-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="qtchooser" xreflabel="qtchooser-&qtchooser-version;">
+  <?dbhtml filename="qtchooser.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>qtchooser-&qtchooser-version;</title>
+
+  <indexterm zone="qtchooser">
+    <primary sortas="a-qtchooser">qtchooser</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to qtchooser</title>
+
+    <para>
+      The <application>qtchooser</application> package contains a wrapper used to select
+      between <application>Qt</application> binary versions.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&qtchooser-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&qtchooser-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &qtchooser-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &qtchooser-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &qtchooser-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &qtchooser-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">qtchooser Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="qt4"/> (for the testsuite)
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/qtchooser"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of qtchooser</title>
+
+    <warning>
+      <para>
+         If both <application>Qt4</application> and
+         <application>Qt5</application> are installed on the system,
+         then <application>Qt4</application> should be set as
+         default unless stated otherwise.
+      </para>
+    </warning>
+
+    <para>
+      Install <application>qtchooser</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &&
+install -m644 doc/qtchooser.1 /usr/share/man/man1</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring qtchooser</title>
+
+    <sect3 id="qtchooser-config">
+      <title>Config Files</title>
+      <para>
+        <filename>/etc/xdg/qtchooser/default.conf</filename>
+      </para>
+
+      <indexterm zone="qtchooser qtchooser-config">
+        <primary
+        sortas="e-etc-xdg-qtchooser-default.conf">/etc/xdg/qtchooser/default.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        The <filename>/etc/xdg/qtchooser/default.conf</filename>
+        configuration file contains paths to the
+        <application>Qt</application> binaries and libraries which will
+        be used when the wrapper is run. It is ussually a symlink to a
+        package specific file, such as <filename>4.conf</filename> or
+        <filename>5.conf</filename>. In first case, when invoking the wrappers,
+        <application>Qt4</application> equivalents will be invoked. In second
+        case, <application>Qt5</application> equivalents will be invoked.
+      </para>
+
+      <para>
+        Create the configuration files by running the following commands as
+        the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &&
+cat > /etc/xdg/qtchooser/4.conf << "EOF"
+<literal>/usr/lib/qt4/bin
+/usr/lib</literal>
+EOF
+cat > /etc/xdg/qtchooser/5.conf << "EOF"
+<literal>/usr/lib/qt5/bin
+/usr/lib</literal>
+EOF</userinput></screen>
+
+      <para>
+        To set <application>Qt4</application> as the default, run the following
+        command as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ln -sfv 4.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
+
+      <para>
+        To set <application>Qt5</application> as the default, run the following
+        command as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ln -sfv 5.conf /etc/xdg/qtchooser/default.conf</userinput></screen>
+
+      <para>
+        You can also select default <application>Qt</application> using an environment
+        variable.
+      </para>
+
+      <para>
+        To set <application>Qt4</application> as the default, run the following command:
+      </para>
+
+<screen><userinput>export QT_SELECT=4</userinput></screen>
+
+      <para>
+        To set <application>Qt5</application> as the default, run the following command:
+      </para>
+
+<screen><userinput>export QT_SELECT=5</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, designer, lconvert, linguist, lrelease, lupdate, moc,
+          pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml, qdbusviewer,
+          qdbusxml2cpp, qdoc, qdoc3, qglinfo, qhelpconverter, qhelpgenerator,
+          qmake, qml1plugindump, qmlbundle, qmlmin, qmlplugindump, qmlprofiler,
+          qmlscene, qmltestrunner, qmlviewer, qtchooser, qtconfig, rcc, uic,
+          uic3, xmlpatterns and xmlpatternsvalidator
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qtchooser-prog">
+        <term><command>qtchooser</command></term>
+        <listitem>
+          <para>
+            is a wrapper used to select between <application>Qt</application>
+            binary versions.
+          </para>
+          <indexterm zone="qtchooser qtchooser-prog">
+            <primary sortas="b-qtchooser">qtchooser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Sun Aug 11 11:19:39 2013	(r11612)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Sun Aug 11 11:36:44 2013	(r11613)
@@ -53,6 +53,9 @@
           <para>[krejzi] - Added Qt 5.1.0.</para>
         </listitem>
         <listitem>
+          <para>[krejzi] - Added qtchooser 31.</para>
+        </listitem>
+         <listitem>
           <para>[krejzi] - Transmission 2.82.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml	Sun Aug 11 11:19:39 2013	(r11612)
+++ trunk/BOOK/x/lib/qt4.xml	Sun Aug 11 11:36:44 2013	(r11613)
@@ -79,7 +79,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="mesalib"/>
+      <xref linkend="mesalib"/> and
+      <xref linkend="qtchooser"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -115,6 +116,14 @@
   <sect2 role="installation">
     <title>Installation of Qt</title>
 
+   <warning>
+      <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>
+    </warning>
+
     <caution>
       <para>
         If <application>Qt</application> is being reinstalled, run the
@@ -213,10 +222,8 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<!-- This will be handled by qtchooser -->
 <screen role="root"><userinput>for file in /usr/lib/qt4/bin/*
 do
-  ln -sfv ../lib/qt4/bin/$(basename $file) /usr/bin/$(basename $file)
   ln -sfv ../lib/qt4/bin/$(basename $file) /usr/bin/$(basename $file)-qt4
 done</userinput></screen>
 
@@ -235,8 +242,10 @@
       version of <application>Qt</application>.
     </para>
 
-    <para><parameter>-release</parameter>:
-    This switch disables building with debugging symbols.</para>
+    <para>
+      <parameter>-release</parameter>: This switch disables
+      building with debugging symbols.
+    </para>
 
     <para>
       <parameter>-nomake examples -nomake demos</parameter>:
@@ -278,17 +287,17 @@
     </para>
 
     <para>
+      <parameter>-optimized-qmake</parameter>: This switch enables
+      building of the optimized <command>qmake</command> program.
+    </para>
+
+    <para>
       <parameter>-plugin-sql-<replaceable><driver></replaceable></parameter>:
       These switches enable SQL support in the
       <application>Qt</application> libraries. Available drivers are:
       ibase, mysql, psql, sqlite and odbc.
     </para>
 
-    <para>
-      <parameter>-no-dbus</parameter>: Use this switch if you don't have
-      <application>D-Bus</application> installed.
-    </para>
-
   </sect2>
 
   <sect2 role="configuration">
@@ -317,8 +326,8 @@
         As the <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root">install -dm755 /usr/share/applications
-<userinput>cat > /usr/share/applications/qtconfig-qt4.desktop << "EOF"
+<screen role="root"><userinput>install -dm755 /usr/share/applications
+cat > /usr/share/applications/qtconfig-qt4.desktop << "EOF"
 <literal>[Desktop Entry]
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
@@ -363,14 +372,8 @@
 Encoding=UTF-8
 Type=Application
 Categories=Qt;Development;</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you compiled <application>Qt</application> with
-        <application>D-Bus</application> support:
-      </para>
-
-<screen role="root"><userinput>cat > /usr/share/applications/qdbusviewer-qt4.desktop << "EOF"
+EOF
+cat > /usr/share/applications/qdbusviewer-qt4.desktop << "EOF"
 <literal>[Desktop Entry]
 Name=Qt4 QDbusViewer 
 GenericName=D-Bus Debugger
@@ -397,25 +400,27 @@
 
       <seglistitem>
         <seg>
-          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 and xmlpatternsvalidator
+          assistant-qt4, designer-qt4, lconvert-qt4, linguist-qt4,
+          lrelease-qt4, lupdate-qt4, moc-qt4, pixeltool-qt4,
+          qcollectiongenerator-qt4, qdbuscpp2xml-qt4, qdbus-qt4,
+          qdbusviewer-qt4, qdbusxml2cpp-qt4, qdoc3-qt4, qhelpconverter-qt4,
+          qhelpgenerator-qt4, qmake-qt4, qmlplugindump-qt4, qmlviewer-qt4,
+          qt3to4-qt4, qtconfig-qt4, qttracereplay-qt4, rcc-qt4, uic3-qt4,
+          uic-qt4, xmlpatterns-qt4 and xmlpatternsvalidator-qt4
         </seg>
         <seg>
           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
+          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
         </seg>
         <seg>
           /usr/include/qt4,
           /usr/lib/qt4,
-          /usr/share/qt4 and
-          /usr/share/doc/qt4
+          /usr/share/doc/qt4 and
+          /usr/share/qt4
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -425,20 +430,20 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="qt-assistant">
-        <term><command>assistant</command></term>
+      <varlistentry id="assistant-qt4">
+        <term><command>assistant-qt4</command></term>
         <listitem>
           <para>
             is a tool for presenting on-line documentation.
           </para>
-          <indexterm zone="qt4 qt-assistant">
-            <primary sortas="b-assistant">assistant</primary>
+          <indexterm zone="qt4 assistant-qt4">
+            <primary sortas="b-assistant-qt4">assistant-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-designer">
-        <term><command>designer</command></term>
+      <varlistentry id="designer-qt4">
+        <term><command>designer-qt4</command></term>
         <listitem>
           <para>
             is a full-fledged GUI builder. It includes
@@ -446,40 +451,40 @@
             layout, support for custom widgets, and an advanced
             property editor.
           </para>
-          <indexterm zone="qt4 qt-designer">
-            <primary sortas="b-designer">designer</primary>
+          <indexterm zone="qt4 designer-qt4">
+            <primary sortas="b-designer-qt4">designer-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-linguist">
-        <term><command>linguist</command></term>
+      <varlistentry id="linguist-qt4">
+        <term><command>linguist-qt4</command></term>
         <listitem>
           <para>
             provides support for translating applications into
             local languages.
           </para>
-          <indexterm zone="qt4 qt-linguist">
-            <primary sortas="b-linguist">linguist</primary>
+          <indexterm zone="qt4 linguist-qt4">
+            <primary sortas="b-linguist-qt4">linguist-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-lrelease">
-        <term><command>lrelease</command></term>
+      <varlistentry id="lrelease-qt4">
+        <term><command>lrelease-qt4</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 qt-lrelease">
-            <primary sortas="b-lrelease">lrelease</primary>
+          <indexterm zone="qt4 lrelease-qt4">
+            <primary sortas="b-lrelease-qt4">lrelease-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-lupdate">
-        <term><command>lupdate</command></term>
+      <varlistentry id="lupdate-qt4">
+        <term><command>lupdate-qt4</command></term>
         <listitem>
           <para>
             reads a Qt project file, finds the translatable
@@ -487,109 +492,109 @@
             interface files, and produces or updates the translation
             files listed in the project file.
           </para>
-          <indexterm zone="qt4 qt-lupdate">
-            <primary sortas="b-lupdate">lupdate</primary>
+          <indexterm zone="qt4 lupdate-qt4">
+            <primary sortas="b-lupdate-qt4">lupdate-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-moc">
-        <term><command>moc</command></term>
+      <varlistentry id="moc-qt4">
+        <term><command>moc-qt4</command></term>
         <listitem>
           <para>
             generates Qt meta object support code.
           </para>
-          <indexterm zone="qt4 qt-moc">
-            <primary sortas="b-moc">moc</primary>
+          <indexterm zone="qt4 moc-qt4">
+            <primary sortas="b-moc-qt4">moc-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-pixeltool">
-        <term><command>pixeltool</command></term>
+      <varlistentry id="pixeltool-qt4">
+        <term><command>pixeltool-qt4</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 qt-pixeltool">
-            <primary sortas="b-pixeltool">pixeltool</primary>
+          <indexterm zone="qt4 pixeltool-qt4">
+            <primary sortas="b-pixeltool-qt4">pixeltool-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-qmake">
-        <term><command>qmake</command></term>
+      <varlistentry id="qmake-qt4">
+        <term><command>qmake-qt4</command></term>
         <listitem>
           <para>
             uses information stored in project files to
             determine what should go in the makefiles it
             generates.
           </para>
-          <indexterm zone="qt4 qt-qmake">
-            <primary sortas="b-qmake">qmake</primary>
+          <indexterm zone="qt4 qmake-qt4">
+            <primary sortas="b-qmake-qt4">qmake-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-qt3to4">
-        <term><command>qt3to4</command></term>
+      <varlistentry id="qt3to4-qt4">
+        <term><command>qt3to4-qt4</command></term>
         <listitem>
           <para>
             qt3to4 is a tool to help update Qt3 code to Qt4.
           </para>
-          <indexterm zone="qt4 qt-qt3to4">
-            <primary sortas="b-qt3to4">qt3to4</primary>
+          <indexterm zone="qt4 qt3to4-qt4">
+            <primary sortas="b-qt3to4-qt4">qt3to4-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-qtconfig">
-        <term><command>qtconfig</command></term>
+      <varlistentry id="qtconfig-qt4">
+        <term><command>qtconfig-qt4</command></term>
         <listitem>
           <para>
             is used to customize the appearance of Qt applications.
           </para>
-          <indexterm zone="qt4 qt-qtconfig">
-            <primary sortas="b-qtconfig">qtconfig</primary>
+          <indexterm zone="qt4 qtconfig-qt4">
+            <primary sortas="b-qtconfig-qt4">qtconfig-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-rcc">
-        <term><command>rcc</command></term>
+      <varlistentry id="rcc-qt4">
+        <term><command>rcc-qt4</command></term>
         <listitem>
           <para>
             is a resource compiler used in conjunction with designer.
           </para>
-          <indexterm zone="qt4 qt-rcc">
-            <primary sortas="b-rcc">rcc</primary>
+          <indexterm zone="qt4 rcc-qt4">
+            <primary sortas="b-rcc-qt4">rcc-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-uic">
-        <term><command>uic</command></term>
+      <varlistentry id="uic-qt4">
+        <term><command>uic-qt4</command></term>
         <listitem>
           <para>
             is a Qt user interface compiler.
           </para>
-          <indexterm zone="qt4 qt-uic">
-            <primary sortas="b-uic">uic</primary>
+          <indexterm zone="qt4 uic-qt4">
+            <primary sortas="b-uic-qt4">uic-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-uic3">
-        <term><command>uic3</command></term>
+      <varlistentry id="uic3-qt4">
+        <term><command>uic3-qt4</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 qt-uic3">
-            <primary sortas="b-uic3">uic3</primary>
+          <indexterm zone="qt4 uic3-qt4">
+            <primary sortas="b-uic3-qt4">uic3-qt4</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml	Sun Aug 11 11:19:39 2013	(r11612)
+++ trunk/BOOK/x/lib/qt5.xml	Sun Aug 11 11:36:44 2013	(r11613)
@@ -93,6 +93,7 @@
     <para role="required">
       <xref linkend="alsa-lib"/>,
       <xref linkend="mesalib"/>,
+      <xref linkend="qtchooser"/>,
       <xref linkend="xcb-util-image"/>,
       <xref linkend="xcb-util-keysyms"/>,
       <xref linkend="xcb-util-renderutil"/> and



More information about the blfs-book mailing list