Author: krejzi
Date: Sun Jun 2 12:23:30 2013
New Revision: 11255
Log:
Qt instructions update: Install in /usr by default, don't install executable
files in /usr/bin by default - symlink them for now. They will conflict with
Qt5 versions. Qtchooser package will handle which Qt version is in use when the
time is right.
Added:
trunk/BOOK/x/lib/qt4.xml
- copied, changed from r11230, trunk/BOOK/x/lib/qt.xml
Deleted:
trunk/BOOK/x/lib/qt.xml
Modified:
trunk/BOOK/archive/kde/add/kdeaccessibility.xml
trunk/BOOK/archive/kde/add/kdegames.xml
trunk/BOOK/archive/kde/add/kdemultimedia.xml
trunk/BOOK/archive/kde/add/kdetoys.xml
trunk/BOOK/archive/kde/add/kdeutils.xml
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/libdbusmenuqt.xml
trunk/BOOK/general/genlib/qca.xml
trunk/BOOK/general/genlib/qjson.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/kde/core/akonadi.xml
trunk/BOOK/kde/core/attica.xml
trunk/BOOK/kde/core/automoc4.xml
trunk/BOOK/kde/core/config.xml
trunk/BOOK/kde/core/phonon.xml
trunk/BOOK/kde/core/polkit-qt.xml
trunk/BOOK/kde/core/qimageblitz.xml
trunk/BOOK/multimedia/videoutils/vlc.xml
trunk/BOOK/networking/netprogs/wpa_supplicant.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
Modified: trunk/BOOK/archive/kde/add/kdeaccessibility.xml
==============================================================================
--- trunk/BOOK/archive/kde/add/kdeaccessibility.xml Sun Jun 2 09:33:41
2013 (r11254)
+++ trunk/BOOK/archive/kde/add/kdeaccessibility.xml Sun Jun 2 12:23:30
2013 (r11255)
@@ -111,7 +111,7 @@
make -f admin/Makefile.common &&
./configure --prefix=$TRINITY_PREFIX \
- --with-qt-dir=$QTDIR \
+ --with-qt4-dir=$QTDIR \
--enable-closure \
--with-alsa \
--with-extra-includes=$TRINITY_PREFIX/include \
Modified: trunk/BOOK/archive/kde/add/kdegames.xml
==============================================================================
--- trunk/BOOK/archive/kde/add/kdegames.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/archive/kde/add/kdegames.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -91,7 +91,7 @@
make -f admin/Makefile.common &&
./configure --prefix=$TRINITY_PREFIX \
- --with-qt-dir=$QTDIR \
+ --with-qt4-dir=$QTDIR \
--enable-closure \
--with-extra-includes=$TRINITY_PREFIX/include \
--with-extra-libs=$TRINITY_PREFIX/lib &&
Modified: trunk/BOOK/archive/kde/add/kdemultimedia.xml
==============================================================================
--- trunk/BOOK/archive/kde/add/kdemultimedia.xml Sun Jun 2 09:33:41
2013 (r11254)
+++ trunk/BOOK/archive/kde/add/kdemultimedia.xml Sun Jun 2 12:23:30
2013 (r11255)
@@ -123,7 +123,7 @@
export LIBRARY_PATH=$TRINITY_PREFIX/lib &&
./configure --prefix=$TRINITY_PREFIX \
- --with-qt-dir=$QTDIR \
+ --with-qt4-dir=$QTDIR \
--enable-closure \
--with-vorbis \
--with-alsa \
Modified: trunk/BOOK/archive/kde/add/kdetoys.xml
==============================================================================
--- trunk/BOOK/archive/kde/add/kdetoys.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/archive/kde/add/kdetoys.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -87,7 +87,7 @@
make -f admin/Makefile.common &&
./configure --prefix=$TRINITY_PREFIX \
- --with-qt-dir=$QTDIR \
+ --with-qt4-dir=$QTDIR \
--enable-closure \
--with-extra-libs=$TRINITY_PREFIX/lib &&
Modified: trunk/BOOK/archive/kde/add/kdeutils.xml
==============================================================================
--- trunk/BOOK/archive/kde/add/kdeutils.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/archive/kde/add/kdeutils.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -120,7 +120,7 @@
make -f admin/Makefile.common &&
./configure --prefix=$TRINITY_PREFIX \
- --with-qt-dir=$QTDIR \
+ --with-qt4-dir=$QTDIR \
--enable-closure \
--with-extra-includes=$TRINITY_PREFIX/include \
--with-extra-libs=$TRINITY_PREFIX/lib &&
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/general.ent Sun Jun 2 12:23:30 2013 (r11255)
@@ -562,14 +562,14 @@
<!ENTITY pango-version "1.32.5">
<!ENTITY pangox-version "0.0.2">
<!ENTITY pangomm-version "2.28.4">
-<!ENTITY qt-version "4.8.4">
+<!ENTITY qt4-version "4.8.4">
<!ENTITY shared-mime-info-version "1.1">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk-version "1.10.2">
<!ENTITY xulrunner-version "21.0">
<!ENTITY gtk2-libdir "2.0/2.10.0">
-<!ENTITY qt-dir "$QTDIR">
+<!ENTITY qt4-dir "$QTDIR">
<!-- Chapter 26 -->
<!ENTITY fluxbox-version "1.3.5">
Modified: trunk/BOOK/general/genlib/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/general/genlib/libdbusmenuqt.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/general/genlib/libdbusmenuqt.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -69,7 +69,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -91,7 +91,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
-DWITH_DOC=OFF .. &&
make</userinput></screen>
@@ -125,7 +125,7 @@
<seglistitem>
<seg>None</seg>
<seg>libdbusmenu-qt.so</seg>
- <seg>&qt-dir;/include/dbusmenu-qt</seg>
+ <seg>&qt4-dir;/include/dbusmenu-qt</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/general/genlib/qca.xml
==============================================================================
--- trunk/BOOK/general/genlib/qca.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/general/genlib/qca.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -71,7 +71,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="which"/>
</para>
@@ -87,7 +87,7 @@
commands:</para>
<screen><userinput>sed -i '217s@set@this->set@'
src/botantools/botan/botan/secmem.h &&
-./configure --prefix=&qt-dir; \
+./configure --prefix=&qt4-dir; \
--certstore-path=/etc/ssl/ca-bundle.crt &&
make</userinput></screen>
@@ -123,7 +123,7 @@
<seglistitem>
<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>
+ <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/general/genlib/qjson.xml
==============================================================================
--- trunk/BOOK/general/genlib/qjson.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/general/genlib/qjson.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -74,7 +74,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="cmake"/>
</para>
@@ -93,7 +93,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
-DCMAKE_BUILD_TYPE=Release \
.. &&
make</userinput></screen>
@@ -125,7 +125,7 @@
libqjson.so
</seg>
<seg>
- &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
+ &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/general/genutils/graphviz.xml
==============================================================================
--- trunk/BOOK/general/genutils/graphviz.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/general/genutils/graphviz.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -100,7 +100,7 @@
<ulink
url="http://www.freedesktop.org/wiki/Software/glitz";>glitz</ulink>,
<xref linkend="gs"/>,
<xref linkend="gtk2"/> and
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<bridgehead renderas="sect4">Optional (To Build Language
Bindings)</bridgehead>
Modified: trunk/BOOK/general/genutils/pinentry.xml
==============================================================================
--- trunk/BOOK/general/genutils/pinentry.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/general/genutils/pinentry.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -71,7 +71,7 @@
<para role="optional">
<xref linkend="gtk2"/>,
<xref linkend="libcap2"/> and
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/general/graphlib/poppler.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -131,7 +131,7 @@
<xref linkend="libtiff"/>,
<xref linkend="libxml2"/>,
<xref linkend="openjpeg"/> and
- <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
+ <xref linkend="qt4"/> (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 Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/general/prog/cmake.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -86,7 +86,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="subversion"/> (for testing) and
- <xref linkend="qt"/> (for the Qt-based GUI)
+ <xref linkend="qt4"/> (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 Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/general/prog/doxygen.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -93,7 +93,7 @@
<xref linkend="graphviz"/>,
<xref linkend="gs"/>,
<xref linkend="python2"/>,
- <xref linkend="qt"/> (for doxywizard) and
+ <xref linkend="qt4"/> (for doxywizard) and
<xref linkend="texlive"/>
</para>
Modified: trunk/BOOK/general/sysutils/strigi.xml
==============================================================================
--- trunk/BOOK/general/sysutils/strigi.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/general/sysutils/strigi.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -65,7 +65,7 @@
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="dbus"/>
</para>
Modified: trunk/BOOK/kde/core/akonadi.xml
==============================================================================
--- trunk/BOOK/kde/core/akonadi.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/akonadi.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -98,7 +98,7 @@
<screen><userinput>mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
- -DCMAKE_PREFIX_PATH=&qt-dir; \
+ -DCMAKE_PREFIX_PATH=&qt4-dir; \
-DCMAKE_BUILD_TYPE=Release \
-DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
.. &&
@@ -115,7 +115,7 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>-DCMAKE_PREFIX_PATH=&qt-dir;</option>: This switch is used to
+ <para><option>-DCMAKE_PREFIX_PATH=&qt4-dir;</option>: This switch is used
to
help <command>cmake</command> find <command>automoc4</command>.</para>
<para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
apply
Modified: trunk/BOOK/kde/core/attica.xml
==============================================================================
--- trunk/BOOK/kde/core/attica.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/attica.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -70,7 +70,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="cmake"/>
</para>
Modified: trunk/BOOK/kde/core/automoc4.xml
==============================================================================
--- trunk/BOOK/kde/core/automoc4.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/automoc4.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -72,7 +72,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="cmake"/> and
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<para condition="html" role="usernotes">User Notes:
@@ -88,7 +88,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; .. &&
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; .. &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
Modified: trunk/BOOK/kde/core/config.xml
==============================================================================
--- trunk/BOOK/kde/core/config.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/config.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -66,7 +66,7 @@
<sect2 role="content">
<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>&qt-dir;</envar> set.</para>
+ running, but remember to keep <envar>&kde-dir;</envar> and
<envar>&qt4-dir;</envar> set.</para>
</sect2>
</sect1>
\ No newline at end of file
Modified: trunk/BOOK/kde/core/phonon.xml
==============================================================================
--- trunk/BOOK/kde/core/phonon.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/phonon.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -89,7 +89,7 @@
<sect2 role="installation">
<title>Installation of Phonon</title>
- <para>Make sure that <xref linkend="qt"/> is compiled without the bundled
+ <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
<application>Phonon</application> library. This package provides
a better implementation.</para>
@@ -98,7 +98,7 @@
<screen><userinput>mkdir build &&
cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
.. &&
Modified: trunk/BOOK/kde/core/polkit-qt.xml
==============================================================================
--- trunk/BOOK/kde/core/polkit-qt.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/polkit-qt.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -86,7 +86,7 @@
<screen><userinput>mkdir build &&
cd build &&
-CMAKE_PREFIX_PATH=&qt-dir; \
+CMAKE_PREFIX_PATH=&qt4-dir; \
cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &&
make</userinput></screen>
@@ -103,7 +103,7 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to
+ <para><option>CMAKE_PREFIX_PATH=&qt4-dir;</option>: This option is set to
find <command>automoc4</command>.</para>
</sect2>
Modified: trunk/BOOK/kde/core/qimageblitz.xml
==============================================================================
--- trunk/BOOK/kde/core/qimageblitz.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/kde/core/qimageblitz.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -70,7 +70,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="cmake"/>
</para>
Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -101,7 +101,7 @@
<xref linkend="liba52"/>,
<xref linkend="libgcrypt"/>,
<xref linkend="libmad"/> and
- <xref linkend="qt"/> (<application>Qt</application> is required for the
+ <xref linkend="qt4"/> (<application>Qt</application> is required for the
graphical user interface; without <application>Qt</application> you will
only be able to use the command line or
<application>ncurses</application>
interface)
Modified: trunk/BOOK/networking/netprogs/wpa_supplicant.xml
==============================================================================
--- trunk/BOOK/networking/netprogs/wpa_supplicant.xml Sun Jun 2 09:33:41
2013 (r11254)
+++ trunk/BOOK/networking/netprogs/wpa_supplicant.xml Sun Jun 2 12:23:30
2013 (r11255)
@@ -88,7 +88,7 @@
<para role="optional">
<xref linkend="dbus"/>,
<xref linkend="libxml2"/> and
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<para condition="html" role="usernotes">User Notes:
@@ -189,7 +189,7 @@
make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
<para>
- If you have installed <xref linkend="qt"/> and wish to build
+ If you have installed <xref linkend="qt4"/> and wish to build
the <application>WPA Supplicant</application> GUI program, run
the following commands:
</para>
Modified: trunk/BOOK/networking/netutils/avahi.xml
==============================================================================
--- trunk/BOOK/networking/netutils/avahi.xml Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/networking/netutils/avahi.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -90,7 +90,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/server/other/soprano.xml
==============================================================================
--- trunk/BOOK/server/other/soprano.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/server/other/soprano.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -78,7 +78,7 @@
<para role="required">
<xref linkend="dbus"/>,
<xref linkend="cmake"/>,
- <xref linkend="qt"/> and
+ <xref linkend="qt4"/> and
<xref linkend="redland"/>
</para>
Modified: trunk/BOOK/x/lib/cairo.xml
==============================================================================
--- trunk/BOOK/x/lib/cairo.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/x/lib/cairo.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -105,7 +105,7 @@
<xref linkend="gtk-doc"/>,
<xref linkend="libdrm"/>,
<xref linkend="mesalib"/>,
- <xref linkend="qt"/>,
+ <xref linkend="qt4"/>,
<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 Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/x/lib/lib.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -49,7 +49,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libxklavier.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="qt.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="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 and modified: trunk/BOOK/x/lib/qt4.xml (from r11230,
trunk/BOOK/x/lib/qt.xml)
==============================================================================
--- trunk/BOOK/x/lib/qt.xml Sat Jun 1 00:43:20 2013 (r11230, copy
source)
+++ trunk/BOOK/x/lib/qt4.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -4,249 +4,297 @@
<!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 "89c5ecba180cae74c66260ac732dc5cb">
- <!ENTITY qt-size "237 MB">
- <!ENTITY qt-buildsize "1.8 GB (full), 619 (essential)">
- <!ENTITY qt-time "69 SBU (full), 54 SBU (essential)">
+ <!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 "89c5ecba180cae74c66260ac732dc5cb">
+ <!ENTITY qt4-size "226 MB">
+ <!ENTITY qt4-buildsize "1.9 GB">
+ <!ENTITY qt4-time "70 SBU">
]>
-<sect1 id="qt" xreflabel="Qt-&qt-version;">
- <?dbhtml filename="qt.html" ?>
+<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
+ <?dbhtml filename="qt4.html" ?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>Qt-&qt-version;</title>
+ <title>Qt-&qt4-version;</title>
- <indexterm zone="qt">
- <primary sortas="a-qt">Qt</primary>
+ <indexterm zone="qt4">
+ <primary sortas="a-Qt">Qt</primary>
</indexterm>
<sect2 role="package">
<title>Introduction to Qt</title>
- <para><application>Qt</application> is a cross-platform application
- framework that is widely used for developing application software
- with a graphical user interface (GUI) (in which cases Qt is classified
- as a widget toolkit), and also used for developing non-GUI programs such
- as command-line tools and consoles for servers. One of the major users
- of <application>Qt</application> is <application>KDE</application>.</para>
+ <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>
&lfs73_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>
+ <para>
+ Download (HTTP): <ulink url="&qt4-download-http;"/>
+ </para>
</listitem>
<listitem>
- <para>Download MD5 sum: &qt-md5sum;</para>
+ <para>
+ Download (FTP): <ulink url="&qt4-download-ftp;"/>
+ </para>
</listitem>
<listitem>
- <para>Download size: &qt-size;</para>
+ <para>
+ Download MD5 sum: &qt4-md5sum;
+ </para>
</listitem>
<listitem>
- <para>Estimated disk space required: &qt-buildsize;</para>
+ <para>
+ Download size: &qt4-size;
+ </para>
</listitem>
<listitem>
- <para>Estimated build time: &qt-time;</para>
+ <para>
+ Estimated disk space required: &qt4-buildsize;
+ </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>
+ Estimated build time: &qt4-time;
</para>
- </listitem>
+ </listitem>
</itemizedlist>
--->
<bridgehead renderas="sect3">Qt Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="x-window-system"/></para>
+ <para role="required">
+ <xref linkend="mesalib"/>
+ </para>
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
+ <xref linkend="cacerts"/>,
<xref linkend="dbus"/>,
+ <xref linkend="glib2"/>,
+ <xref linkend="icu"/> (unicode support),
<xref linkend="libjpeg"/>,
<xref linkend="libmng"/>,
- <xref linkend="libtiff"/>, and
- <!-- previously required dependency <xref linkend="libpng"/> and -->
- <xref linkend="pkgconfig"/> (needed to use D-Bus, GLib, GTK and
PulseAudio)
+ <xref linkend="libpng"/>,
+ <xref linkend="libtiff"/>,
+ <xref linkend="openssl"/> and
+ <xref linkend="sqlite"/>
</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="gtk2"/> (GTK+ 2 theme support),
+ <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
<xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
- <xref linkend="unixodbc"/> and
- <xref linkend="sqlite"/>
+ <xref linkend="pulseaudio"/> and
+ <xref linkend="unixodbc"/>
</para>
<para condition="html" role="usernotes">User Notes:
- <ulink url="&blfs-wiki;/qt"/></para>
-
+ <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>
+ <para>
+ If <application>Qt</application> is being reinstalled, 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>
+ <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>./configure -prefix /opt/qt-&qt-version; \
- -release \
- -nomake examples \
- -nomake demos \
- -system-sqlite \
- -no-nis \
- -opensource \
- -confirm-license &&
+ <para>
+ Install <application>Qt</application> by running the
+ following commands:
+ </para>
+
+<screen><userinput>./configure -confirm-license \
+ -opensource \
+ -release \
+ -prefix /usr \
+ -bindir /usr/lib/qt4/bin \
+ -headerdir /usr/include/qt4 \
+ -datadir /usr/share/qt4 \
+ -plugindir /usr/lib/qt4/plugins \
+ -importdir /usr/lib/qt4/imports \
+ -translationdir /usr/share/qt4/translations \
+ -sysconfdir /etc/xdg \
+ -docdir /usr/share/doc/qt4 \
+ -demosdir /usr/share/doc/qt4/demos \
+ -examplesdir /usr/share/doc/qt4/examples \
+ -dbus-linked \
+ -openssl-linked \
+ -system-sqlite \
+ -plugin-sql-sqlite \
+ -no-phonon \
+ -no-phonon-backend \
+ -no-nis \
+ -no-openvg \
+ -nomake demos \
+ -nomake examples \
+ -optimized-qmake &&
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>
- <para>This package does not come with a test suite.</para>
+<screen role="root"><userinput>make install &&
+rm -rf /usr/tests &&
+install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
+ /usr/share/pixmaps/qt4logo.png &&
+install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
+ /usr/share/pixmaps/assistant-qt4.png &&
+install -v -Dm644 tools/designer/src/designer/images/designer.png \
+ /usr/share/pixmaps/designer-qt4.png &&
+install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
+ /usr/share/pixmaps/linguist-qt4.png &&
+install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+ /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
+
+ <para>
+ Remove references to the build directory from installed files by
+ running the following commands as the
+ <systemitem class="username">root</systemitem> user:
+ </para>
- <para>Now, as the <systemitem class="username">root</systemitem>
- user:</para>
+<screen role="root"><userinput>find /usr/lib/libQt*.prl -exec sed -i -e \
+ '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+find /usr/lib/pkgconfig/Qt*.pc -exec perl -pi -e \
+ "s, -L$(basename $PWD)/?\S+,,g" {} \;</userinput></screen>
+
+ <para>
+ Fix pkg-config files to point to the correct bindir by
+ running the following command as the
+ <systemitem class="username">root</systemitem> user:
+ </para>
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>find /usr/lib/pkgconfig/Qt*.pc -exec sed -i -e \
+ "s@/usr/bin/@/usr/lib/qt4/bin/@g" {} \;</userinput></screen>
- <para>If you installed <application>Qt</application> in the /opt directory,
- again as the <systemitem class="username">root</systemitem> user
issue:</para>
+ <para>
+ Symlink the <application>Qt</application> executables into
+ <filename class="directory">/usr/bin</filename> by running the
+ following commands as the
+ <systemitem class="username">root</systemitem> user:
+ </para>
-<screen role="root"><userinput>ln -svfn qt-&qt-version;
/opt/qt</userinput></screen>
+<!-- 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>
</sect2>
<sect2 role="commands">
<title>Command Explanations</title>
+ <para>
+ <parameter>-confirm-license</parameter>: Accept license
+ without prompting user during configuration.
+ </para>
+
+ <para>
+ <parameter>-opensource</parameter>: Install the opensource
+ version of <application>Qt</application>.
+ </para>
+
<para><parameter>-release</parameter>:
This switch disables building with debugging symbols.</para>
- <para><parameter>-nomake examples, -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>
+ <para>
+ <parameter>-nomake examples -nomake demos</parameter>:
+ These switches disable building programs that are only of
+ interest to a <application>Qt</application> developer.
+ </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>
+ <parameter>-system-sqlite</parameter>: This switch enables use
+ the system version of <application>SQLite</application>.
+ </para>
+
+ <para>
+ <parameter>-no-nis</parameter>: This switch disables support
+ for Network Information Service (NIS) which has been
+ deprecated in recent versions of <application>Glibc</application>.
+ </para>
+
+ <para>
+ <parameter>-no-phonon -no-phonon-backend</parameter>: These
+ switches disable building of the bundled
+ <application>Phonon</application> library. Better version
+ is provided by <xref linkend="phonon"/> package.
+ </para>
+
+ <para>
+ <parameter>-dbus-linkend -openssl-linkend</parameter>: These
+ switches enable explicit linking of the
+ <application>D-Bus</application> and
+ <application>OpenSSL</application> libraries into
+ <application>Qt</application> libraries instead of
+ <command>dlopen()</command>-ing them.
+ </para>
- <para>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>
+ <para>
+ <parameter>-no-openvg</parameter>: This switch disables
+ <application>OpenVG</application> support in
+ <application>Qt</application>.
+ </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>
</sect2>
<sect2 role="configuration">
<title>Configuring Qt</title>
- <sect3 id='qt-config'>
+ <sect3 id="qt4-config">
<title>Configuration Information</title>
- <para>If you installed <application>Qt</application> in /usr, create an
- environment variable needed by certain packages. As the
- <systemitem class="username">root</systemitem> user:</para>
+ <para>
+ Create an environment variable needed by certain packages.
+ As the <systemitem class="username">root</systemitem> user:
+ </para>
<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << EOF
<literal># Begin /etc/profile.d/qt.sh
@@ -258,45 +306,73 @@
# End /etc/profile.d/qt.sh</literal>
EOF</userinput></screen>
- <para>If you installed <application>Qt</application> in a location other
- than /usr, you need to update the following configuration files so
- that <application>Qt</application> is correctly found by other packages
- and system processes.</para>
-
- <para>As the <systemitem class="username">root</systemitem> user, update
- the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
- run-time cache file:</para>
-
-<screen role="root"><userinput>cat >> /etc/ld.so.conf << EOF
-<literal># Begin Qt addition
-
-/opt/qt/lib
-
-# End Qt addition</literal>
+ <para>
+ Create the menu entries for installed applications.
+ 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"
+<literal>[Desktop Entry]
+Name=Qt4 Config
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=qtconfig-qt4
+Icon=qt4logo
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Settings;</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>
+cat > /usr/share/applications/assistant-qt4.desktop << "EOF"
+<literal>[Desktop Entry]
+Name=Qt4 Assistant
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant-qt4
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;</literal>
+EOF
+cat > /usr/share/applications/designer-qt4.desktop << "EOF"
+<literal>[Desktop Entry]
+Name=Qt4 Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer-qt4
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;</literal>
+EOF
+cat > /usr/share/applications/linguist-qt4.desktop << "EOF"
+<literal>[Desktop Entry]
+Name=Qt4 Linguist
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist-qt4
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;</literal>
+EOF
+cat > /usr/share/applications/qdbusviewer-qt4.desktop << "EOF"
+<literal>[Desktop Entry]
+Name=Qt4 QDbusViewer
+GenericName=D-Bus Debugger
+Comment=Debug D-Bus applications
+Exec=qdbusviewer-qt4
+Icon=qdbusviewer-qt4
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Debugger;</literal>
EOF</userinput></screen>
</sect3>
+
</sect2>
<sect2 role="content">
@@ -308,21 +384,27 @@
<segtitle>Installed Directories</segtitle>
<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</seg>
-
- <seg>libphonon.so, libQt3Support.so, libQtCLucene.so, libQtCore.so,
- libQtDBus.so, libQtDeclarative.so, libQtDesigner.so,
- libQtDesignerComponents.so, libQtGui.so, libQtHelp.so, libQtMultimedia,
- 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>
+ <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
+ </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
+ </seg>
+ <seg>
+ /usr/include/qt4,
+ /usr/lib/qt4,
+ /usr/share/qt4 and
+ /usr/share/doc/qt4
+ </seg>
</seglistitem>
</segmentedlist>
@@ -334,8 +416,10 @@
<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">
+ <para>
+ is a tool for presenting on-line documentation.
+ </para>
+ <indexterm zone="qt4 qt-assistant">
<primary sortas="b-assistant">assistant</primary>
</indexterm>
</listitem>
@@ -344,11 +428,13 @@
<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">
+ <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 qt-designer">
<primary sortas="b-designer">designer</primary>
</indexterm>
</listitem>
@@ -357,9 +443,11 @@
<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">
+ <para>
+ provides support for translating applications into
+ local languages.
+ </para>
+ <indexterm zone="qt4 qt-linguist">
<primary sortas="b-linguist">linguist</primary>
</indexterm>
</listitem>
@@ -368,9 +456,11 @@
<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">
+ <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>
</listitem>
@@ -379,11 +469,13 @@
<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">
+ <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 qt-lupdate">
<primary sortas="b-lupdate">lupdate</primary>
</indexterm>
</listitem>
@@ -392,8 +484,10 @@
<varlistentry id="qt-moc">
<term><command>moc</command></term>
<listitem>
- <para>generates Qt meta object support code.</para>
- <indexterm zone="qt qt-moc">
+ <para>
+ generates Qt meta object support code.
+ </para>
+ <indexterm zone="qt4 qt-moc">
<primary sortas="b-moc">moc</primary>
</indexterm>
</listitem>
@@ -402,9 +496,11 @@
<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">
+ <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>
</listitem>
@@ -413,9 +509,12 @@
<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">
+ <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>
</listitem>
@@ -424,8 +523,10 @@
<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">
+ <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>
</listitem>
@@ -434,8 +535,10 @@
<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">
+ <para>
+ is used to customize the appearance of Qt applications.
+ </para>
+ <indexterm zone="qt4 qt-qtconfig">
<primary sortas="b-qtconfig">qtconfig</primary>
</indexterm>
</listitem>
@@ -444,8 +547,10 @@
<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">
+ <para>
+ is a resource compiler used in conjunction with designer.
+ </para>
+ <indexterm zone="qt4 qt-rcc">
<primary sortas="b-rcc">rcc</primary>
</indexterm>
</listitem>
@@ -454,8 +559,10 @@
<varlistentry id="qt-uic">
<term><command>uic</command></term>
<listitem>
- <para>is a Qt user interface compiler.</para>
- <indexterm zone="qt qt-uic">
+ <para>
+ is a Qt user interface compiler.
+ </para>
+ <indexterm zone="qt4 qt-uic">
<primary sortas="b-uic">uic</primary>
</indexterm>
</listitem>
@@ -464,10 +571,12 @@
<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">
+ <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>
</listitem>
Modified: trunk/BOOK/xsoft/other/gnash.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gnash.xml Sun Jun 2 09:33:41 2013 (r11254)
+++ trunk/BOOK/xsoft/other/gnash.xml Sun Jun 2 12:23:30 2013 (r11255)
@@ -103,7 +103,7 @@
<xref linkend="git"/>,
<xref linkend="libogg"/>,
<xref linkend="libvorbis"/>,
- <xref linkend="qt"/>,
+ <xref linkend="qt4"/>,
<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 Sun Jun 2 09:33:41 2013
(r11254)
+++ trunk/BOOK/xsoft/other/transmission.xml Sun Jun 2 12:23:30 2013
(r11255)
@@ -86,7 +86,7 @@
<bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
<para role="recommended">
<xref linkend="gtk3"/> or
- <xref linkend="qt"/>
+ <xref linkend="qt4"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -111,7 +111,7 @@
make</userinput></screen>
<para>
- If you have installed <xref linkend="qt"/> and would like to compile the
+ If you have installed <xref linkend="qt4"/> and would like to compile the
Qt GUI, run the following commands:
</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
