Changeset ec7940be for x/lib/qt4.xml


Ignore:
Timestamp:
02/25/2014 07:00:30 PM (10 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
13103ed
Parents:
014d750f
Message:

Rewrite Qt pages
Add corrections for some paths (e.g. man pages)
Tags

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12783 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/qt4.xml

    r014d750f rec7940be  
    106106      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
    107107      <xref linkend="postgresql"/>,
    108       <xref linkend="pulseaudio"/>,
    109       <xref linkend="unixodbc"/>, and
    110       <xref linkend="qtchooser"/> (runtime, if also installing Qt5 and
    111       installing in /usr)
     108      <xref linkend="pulseaudio"/>, and
     109      <xref linkend="unixodbc"/>
    112110    </para>
    113111
    … …  
    117115  </sect2>
    118116
     117  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../xincludes/qt-alternatives.xml"/>
     118
    119119  <sect2 role="installation">
    120120    <title>Installation of Qt</title>
    121 
    122     <para>
    123        There are several ways to install a complicated package such as
    124        <application>Qt</application>. The files are not completely position
    125        independent. Installation procedures execute the program
    126        <command>pkg-config</command> to determine the location of package
    127        executables, libraries, headers, and other files. For
    128        <application>Qt</application>, <command>pkg-config</command> will look
    129        for the appropriate <filename>lib/pkgconfig/Qt*.pc</filename> files
    130        which must be modified if relocating the package. These files are set up
    131        correctly by the build process.
    132     </para>
    133    
    134     <para>
    135        The default installation places the files in <filename
    136        class='directory'>/usr/local/qt/</filename>. Many commercial
    137        distributions place the files in the system's <filename
    138        class='directory'>/usr</filename> hierarchy. The package can also be
    139        installed in an arbitrary directory.
    140     </para>
    141    
    142     <para>
    143        The advantage of installing in <filename
    144        class='directory'>/usr</filename> is that no updates to the
    145        <filename>/etc/ld.so.conf</filename> or
    146        <filename>/etc/man_db.conf</filename> files are required. The package
    147        files are distributed within several subdirectories of the <filename
    148        class='directory'>/usr</filename> hierarchy.  This is the method that
    149        most commercial distributions use.  It is also supported by the
    150        optional <application>qtchooser</application> application.
    151     </para>
    152 
    153        <para>
    154        The disadvantage of installing in <filename
    155        class='directory'>/usr</filename> is that the executable filenames
    156        for  <application>Qt4</application> and <application>Qt5</application>
    157        conflict if both packages are installed in the
    158        same directory.  The instructions below give a workaround for
    159        this problem using the helper program <xref linkend='qtchooser'/>.
    160        This requires renaming the Qt executables with a version suffix.
    161     </para>
    162 
    163     <para>
    164        The advantage of installing <application>Qt4</application> in a custom
    165        directory such as <filename
    166        class='directory'>/opt/qt-&qt4-version;</filename> is that it keeps all
    167        the package files consolidated in a dedicated directory hierarchy. By
    168        using this method, an update can be made without overwriting a previous
    169        installation and users can easily revert to a previous version by
    170        changing one symbolic link or merely changing the PATH variable.  It
    171        also allows a developer to maintain multiple versions of
    172        <application>Qt4</application> or <application>Qt5</application>
    173        for testing.
    174     </para>
    175121
    176122    <caution>
    … …  
    201147    </note>
    202148
     149<!-- ==== Method 1 ====== -->
    203150    <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
    204151
    205152    <para>
    206       Install <application>Qt4</application> by running the
    207       following commands:
    208     </para>
    209 
    210     <note><para>
    211       If <emphasis>not</emphasis> also installing <application>Qt5</application>
    212       into the /usr directory, change the entry for -bindir below to /usr/bin.
    213     </para></note>
    214 
    215 
    216 <screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
     153      Install <application>Qt4</application> into the <filename
     154      class='directory'>/usr</filename> hierarchy by running the following
     155      commands:
     156    </para>
     157
     158<screen><userinput>export QTLINK=/usr
     159
     160sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    217161     config.tests/unix/libmng/libmng.cpp &amp;&amp;
     162
    218163sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
    219164     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
    220165
    221166./configure -prefix         /usr                 \
    222             -bindir         /usr/lib/qt4/bin     \
     167            -bindir         /usr/bin             \
    223168            -plugindir      /usr/lib/qt4/plugins \
    224169            -importdir      /usr/lib/qt4/imports \
    … …  
    258203<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
    259204
    260     <para>
    261       Now, as the <systemitem class="username">root</systemitem> user:
    262     </para>
     205    <para>Now as the <systemitem class="username">root</systemitem> user:</para>
    263206
    264207<screen role="root"><userinput>make install &amp;&amp;
    265 rm -rf /usr/tests &amp;&amp;
    266 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
    267                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
    268 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
    269                   /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
    270 install -v -Dm644 tools/designer/src/designer/images/designer.png \
    271                   /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
    272 install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
    273                   /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
    274 install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    275                   /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
     208rm -rf /usr/tests</userinput></screen>
    276209
    277210    <para>
    … …  
    283216<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
    284217            Designer Gui Help Multimedia Network OpenGL Script \
    285             ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon
    286 do
    287   [ -e /usr/lib/libQt${file}.prl ] &amp;&amp; sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
    288                                               /usr/lib/libQt${file}.prl
     218            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon; do
     219
     220     [ -e /usr/lib/libQt${file}.prl ] &amp;&amp;
     221     sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
     222         -i /usr/lib/libQt${file}.prl
    289223done
    290224unset file</userinput></screen>
    291225
    292     <para>
    293       If also installing Qt5 into /usr,
    294       symlink the <application>Qt4</application> executables into
    295       <filename class="directory">/usr/bin</filename> by running the
    296       following commands as the
    297       <systemitem class="username">root</systemitem> user:
    298     </para>
    299 
    300 <screen role="root"><userinput>for file in /usr/lib/qt4/bin/*
    301 do
    302   ln -sfv ../lib/qt4/bin/$(basename $file) /usr/bin/$(basename $file)-qt4
    303 done</userinput></screen>
    304 
     226<!-- ==== Method 2 ====== -->
    305227    <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead>
    306228
    307229    <para>
    308       This section provides an alternate way to install Qt4 by installing
    309       almost all of the files in the <filename class="directory">/opt</filename>
    310       directory. This allows management of all Qt4 related files in one unit.
    311       For instance, a new version of Qt4 can be installed without over-writing
    312       the existing installation and entire Qt4 instances can be easily removed.
    313       However, it has the disadvantage of needing some extra configuration.
    314     </para>
    315  
    316 
    317     <para>
    318       Install <application>Qt</application> in  /opt/qt-&qt4-version;
    319       by running the following commands:
    320     </para>
    321 
    322 <screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
     230      This section provides for installing Qt4 almost all of the files in the
     231      <filename class="directory">/opt</filename> directory.
     232    </para>
     233
     234<screen><userinput>export QTDIR=/opt/qt-&qt4-version; &amp;&amp;
     235export QTLINK=/opt/qt &amp;&amp;
     236
     237sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    323238     config.tests/unix/libmng/libmng.cpp &amp;&amp;
     239
    324240sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
    325241     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
    326242
    327 export QTDIR=/opt/qt-&qt4-version;
    328 
    329 ./configure -prefix     $QTDIR   \
     243./configure -prefix $QTDIR       \
    330244            -sysconfdir /etc/xdg \
    331245            -confirm-license     \
    … …  
    350264    </para>
    351265
    352 <screen role="root"><userinput>make install &amp;&amp;
    353 
    354 install -v -dm755 /usr/share/pixmaps/                 &amp;&amp;
    355 install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
    356                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
    357 install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
    358                   /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
    359 install -v -Dm644 tools/designer/src/designer/images/designer.png \
    360                   /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
    361 install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
    362                   /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
    363 install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    364                   /usr/share/pixmaps/qdbusviewer-qt4.png</userinput></screen>
     266<screen role="root"><userinput>make install
     267ln -svfn $QTDIR /opt/qt</userinput></screen>
    365268
    366269    <para>
    … …  
    371274
    372275<screen role="root"><userinput>for file in `basename -a -s .prl $QTDIR/lib/lib*.prl`; do
    373   sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' \
    374        $QTDIR/lib/${file}.prl
    375   perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
     276   sed -r '/^QMAKE_PRL_BUILD_DIR/d'    \
     277       -r 's/(QMAKE_PRL_LIBS =).*/\1/' \
     278       -i $QTDIR/lib/${file}.prl
     279
     280   perl -pi -e "s, -L$PWD/?\S+,,g" $QTDIR/lib/pkgconfig/${file##lib}.pc
    376281done
    377282
    378283unset file</userinput></screen>
    379284
    380     <para>
    381       Symlink the <application>Qt4</application> executables into
    382       <filename class="directory">/usr/bin</filename> by running the
    383       following commands as the
    384       <systemitem class="username">root</systemitem> user:
    385     </para>
    386 
    387 <screen role="root"><userinput>ln -svf $QTDIR /opt/qt &amp;&amp;
    388 
    389 for file in /opt/qt/bin/*; do
    390   ln -sfvn $file /usr/bin/$(basename $file)-qt4
    391 done</userinput></screen>
     285<!-- ==== Common  ====== -->
     286    <bridgehead renderas="sect3">Continuing for Both Methods</bridgehead>
     287
     288      <para>
     289        For all methods, install images and create the menu entries
     290        for installed applications.  Be sure that the <envar>QTLINK</envar>
     291        variable is defined in root's environment and
     292        as the <systemitem class="username">root</systemitem> user:
     293      </para>
     294
     295<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
     296                  /usr/share/pixmaps/qt4logo.png       &amp;&amp;
     297
     298install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
     299                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
     300
     301install -v -Dm644 tools/designer/src/designer/images/designer.png \
     302                  /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
     303
     304install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
     305                  /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
     306
     307install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
     308                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
     309
     310install -dm755 /usr/share/applications &amp;&amp;
     311
     312cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
     313<literal>[Desktop Entry]
     314Name=Qt4 Assistant
     315Comment=Shows Qt4 documentation and examples
     316Exec=$QTLINK/bin/assistant
     317Icon=assistant-qt4.png
     318Terminal=false
     319Encoding=UTF-8
     320Type=Application
     321Categories=Qt;Development;Documentation;</literal>
     322EOF
     323
     324cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; EOF
     325<literal>[Desktop Entry]
     326Name=Qt4 Designer
     327Comment=Design GUIs for Qt4 applications
     328Exec=$QTLINK/bin/designer
     329Icon=designer-qt4.png
     330MimeType=application/x-designer;
     331Terminal=false
     332Encoding=UTF-8
     333Type=Application
     334Categories=Qt;Development;</literal>
     335EOF
     336
     337cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
     338<literal>[Desktop Entry]
     339Name=Qt4 Linguist
     340Comment=Add translations to Qt4 applications
     341Exec=$QTLINK/bin/linguist
     342Icon=linguist-qt4.png
     343MimeType=text/vnd.trolltech.linguist;application/x-linguist;
     344Terminal=false
     345Encoding=UTF-8
     346Type=Application
     347Categories=Qt;Development;</literal>
     348EOF
     349
     350cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; EOF
     351<literal>[Desktop Entry]
     352Name=Qt4 QDbusViewer
     353GenericName=D-Bus Debugger
     354Comment=Debug D-Bus applications
     355Exec=$QTLINK/bin/qdbusviewer
     356Icon=qdbusviewer-qt4.png
     357Terminal=false
     358Encoding=UTF-8
     359Type=Application
     360Categories=Qt;Development;Debugger;</literal>
     361EOF
     362
     363cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
     364<literal>[Desktop Entry]
     365Name=Qt4 Config
     366Comment=Configure Qt4 behavior, styles, fonts
     367Exec=$QTLINK/bin/qtconfig-qt4
     368Icon=qt4logo.png
     369Terminal=false
     370Encoding=UTF-8
     371Type=Application
     372Categories=Qt;Settings;</literal>
     373EOF</userinput></screen>
    392374
    393375  </sect2>
    … …  
    399381      <command>sed -i ...</command>: First command fixes detection of
    400382      <application>libmng</application> 2.0 and second one prevents configure
    401       script to write in root directory if building as privileged user.
     383      script from writing to the root directory if building as privileged user.
    402384    </para>
    403385
    … …  
    420402      <parameter>-nomake examples -nomake demos</parameter>:
    421403      These switches disable building programs that are only of
    422       interest to a <application>Qt</application> developer.
     404      interest to a developer using <application>Qt</application>.
    423405    </para>
    424406
    … …  
    484466
    485467QTDIR=/usr
    486 
    487468export QTDIR
    488469
    … …  
    533514EOF</userinput></screen>
    534515
    535       <para>
    536         For all methods, create the menu entries for installed applications.
    537         As the <systemitem class="username">root</systemitem> user:
    538       </para>
    539 
    540 <screen role="root"><userinput>install -dm755 /usr/share/applications
    541 
    542 cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; "EOF"
    543 <literal>[Desktop Entry]
    544 Name=Qt4 Config
    545 Comment=Configure Qt4 behavior, styles, fonts
    546 Exec=qtconfig-qt4
    547 Icon=qt4logo
    548 Terminal=false
    549 Encoding=UTF-8
    550 Type=Application
    551 Categories=Qt;Settings;</literal>
    552 EOF
    553 
    554 cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; "EOF"
    555 <literal>[Desktop Entry]
    556 Name=Qt4 Assistant
    557 Comment=Shows Qt4 documentation and examples
    558 Exec=assistant-qt4
    559 Icon=assistant-qt4
    560 Terminal=false
    561 Encoding=UTF-8
    562 Type=Application
    563 Categories=Qt;Development;Documentation;</literal>
    564 EOF
    565 
    566 cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; "EOF"
    567 <literal>[Desktop Entry]
    568 Name=Qt4 Designer
    569 Comment=Design GUIs for Qt4 applications
    570 Exec=designer-qt4
    571 Icon=designer-qt4
    572 MimeType=application/x-designer;
    573 Terminal=false
    574 Encoding=UTF-8
    575 Type=Application
    576 Categories=Qt;Development;</literal>
    577 EOF
    578 
    579 cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; "EOF"
    580 <literal>[Desktop Entry]
    581 Name=Qt4 Linguist
    582 Comment=Add translations to Qt4 applications
    583 Exec=linguist-qt4
    584 Icon=linguist-qt4
    585 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
    586 Terminal=false
    587 Encoding=UTF-8
    588 Type=Application
    589 Categories=Qt;Development;</literal>
    590 EOF
    591 
    592 cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; "EOF"
    593 <literal>[Desktop Entry]
    594 Name=Qt4 QDbusViewer
    595 GenericName=D-Bus Debugger
    596 Comment=Debug D-Bus applications
    597 Exec=qdbusviewer-qt4
    598 Icon=qdbusviewer-qt4
    599 Terminal=false
    600 Encoding=UTF-8
    601 Type=Application
    602 Categories=Qt;Development;Debugger;</literal>
    603 EOF</userinput></screen>
    604516
    605517    </sect3>
    606 
     518   
     519    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     520                href="../../xincludes/setqt.xml"/>
    607521  </sect2>
    608522
    … …  
    617531      <seglistitem>
    618532        <seg>
    619           assistant-qt4, designer-qt4, lconvert-qt4, linguist-qt4,
    620           lrelease-qt4, lupdate-qt4, moc-qt4, pixeltool-qt4,
    621           qcollectiongenerator-qt4, qdbuscpp2xml-qt4, qdbus-qt4,
    622           qdbusviewer-qt4, qdbusxml2cpp-qt4, qdoc3-qt4, qhelpconverter-qt4,
    623           qhelpgenerator-qt4, qmake-qt4, qmlplugindump-qt4, qmlviewer-qt4,
    624           qt3to4-qt4, qtconfig-qt4, qttracereplay-qt4, rcc-qt4, uic3-qt4,
    625           uic-qt4, xmlpatterns-qt4 and xmlpatternsvalidator-qt4
     533          assistant, designer, lconvert, linguist,
     534          lrelease, lupdate, moc, pixeltool,
     535          qcollectiongenerator, qdbuscpp2xml, qdbus,
     536          qdbusviewer, qdbusxml2cpp, qdoc3, qhelpconverter,
     537          qhelpgenerator, qmake, qmlplugindump, qmlviewer,
     538          qt3to4, qtconfig, qttracereplay, rcc, uic3,
     539          uic, xmlpatterns, and xmlpatternsvalidator
    626540        </seg>
    627541        <seg>
    … …  
    631545          libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
    632546          libQtSql.so, libQtSvg.so, libQtTest.so, libQtWebKit.so,
    633           libQtXmlPatterns.so and libQtXml.so
     547          libQtXmlPatterns.so, and libQtXml.so
    634548        </seg>
    635549        <seg>
    … …  
    637551          /usr/lib/qt4,
    638552          /usr/share/doc/qt4, and
    639           /usr/share/qt4 (OR $QTDIR)
    640           (OR $QTDIR)
     553          /usr/share/qt4
     554          OR
     555          /opt/qt and
     556          /opt/qt-&qt4-version;
    641557        </seg>
    642558      </seglistitem>
    … …  
    649565
    650566      <varlistentry id="assistant-qt4">
    651         <term><command>assistant-qt4</command></term>
     567        <term><command>assistant</command></term>
    652568        <listitem>
    653569          <para>
    … …  
    655571          </para>
    656572          <indexterm zone="qt4 assistant-qt4">
    657             <primary sortas="b-assistant-qt4">assistant-qt4</primary>
     573            <primary sortas="b-assistant-qt4">assistant</primary>
    658574          </indexterm>
    659575        </listitem>
    … …  
    661577
    662578      <varlistentry id="designer-qt4">
    663         <term><command>designer-qt4</command></term>
     579        <term><command>designer</command></term>
    664580        <listitem>
    665581          <para>
    … …  
    670586          </para>
    671587          <indexterm zone="qt4 designer-qt4">
    672             <primary sortas="b-designer-qt4">designer-qt4</primary>
     588            <primary sortas="b-designer-qt4">designer</primary>
    673589          </indexterm>
    674590        </listitem>
    … …  
    676592
    677593      <varlistentry id="linguist-qt4">
    678         <term><command>linguist-qt4</command></term>
     594        <term><command>linguist</command></term>
    679595        <listitem>
    680596          <para>
    … …  
    683599          </para>
    684600          <indexterm zone="qt4 linguist-qt4">
    685             <primary sortas="b-linguist-qt4">linguist-qt4</primary>
     601            <primary sortas="b-linguist-qt4">linguist</primary>
    686602          </indexterm>
    687603        </listitem>
    … …  
    689605
    690606      <varlistentry id="lrelease-qt4">
    691         <term><command>lrelease-qt4</command></term>
     607        <term><command>lrelease</command></term>
    692608        <listitem>
    693609          <para>
    … …  
    696612          </para>
    697613          <indexterm zone="qt4 lrelease-qt4">
    698             <primary sortas="b-lrelease-qt4">lrelease-qt4</primary>
     614            <primary sortas="b-lrelease-qt4">lrelease</primary>
    699615          </indexterm>
    700616        </listitem>
    … …  
    702618
    703619      <varlistentry id="lupdate-qt4">
    704         <term><command>lupdate-qt4</command></term>
     620        <term><command>lupdate</command></term>
    705621        <listitem>
    706622          <para>
    … …  
    711627          </para>
    712628          <indexterm zone="qt4 lupdate-qt4">
    713             <primary sortas="b-lupdate-qt4">lupdate-qt4</primary>
     629            <primary sortas="b-lupdate-qt4">lupdate</primary>
    714630          </indexterm>
    715631        </listitem>
    … …  
    717633
    718634      <varlistentry id="moc-qt4">
    719         <term><command>moc-qt4</command></term>
     635        <term><command>moc</command></term>
    720636        <listitem>
    721637          <para>
    … …  
    723639          </para>
    724640          <indexterm zone="qt4 moc-qt4">
    725             <primary sortas="b-moc-qt4">moc-qt4</primary>
     641            <primary sortas="b-moc-qt4">moc</primary>
    726642          </indexterm>
    727643        </listitem>
    … …  
    729645
    730646      <varlistentry id="pixeltool-qt4">
    731         <term><command>pixeltool-qt4</command></term>
     647        <term><command>pixeltool</command></term>
    732648        <listitem>
    733649          <para>
    … …  
    736652          </para>
    737653          <indexterm zone="qt4 pixeltool-qt4">
    738             <primary sortas="b-pixeltool-qt4">pixeltool-qt4</primary>
     654            <primary sortas="b-pixeltool-qt4">pixeltool</primary>
    739655          </indexterm>
    740656        </listitem>
    … …  
    742658
    743659      <varlistentry id="qmake-qt4">
    744         <term><command>qmake-qt4</command></term>
     660        <term><command>qmake</command></term>
    745661        <listitem>
    746662          <para>
    … …  
    750666          </para>
    751667          <indexterm zone="qt4 qmake-qt4">
    752             <primary sortas="b-qmake-qt4">qmake-qt4</primary>
     668            <primary sortas="b-qmake-qt4">qmake</primary>
    753669          </indexterm>
    754670        </listitem>
    … …  
    756672
    757673      <varlistentry id="qt3to4-qt4">
    758         <term><command>qt3to4-qt4</command></term>
     674        <term><command>qt3to4</command></term>
    759675        <listitem>
    760676          <para>
    … …  
    762678          </para>
    763679          <indexterm zone="qt4 qt3to4-qt4">
    764             <primary sortas="b-qt3to4-qt4">qt3to4-qt4</primary>
     680            <primary sortas="b-qt3to4-qt4">qt3to4</primary>
    765681          </indexterm>
    766682        </listitem>
    … …  
    768684
    769685      <varlistentry id="qtconfig-qt4">
    770         <term><command>qtconfig-qt4</command></term>
     686        <term><command>qtconfig</command></term>
    771687        <listitem>
    772688          <para>
    … …  
    774690          </para>
    775691          <indexterm zone="qt4 qtconfig-qt4">
    776             <primary sortas="b-qtconfig-qt4">qtconfig-qt4</primary>
     692            <primary sortas="b-qtconfig-qt4">qtconfig</primary>
    777693          </indexterm>
    778694        </listitem>
    … …  
    780696
    781697      <varlistentry id="rcc-qt4">
    782         <term><command>rcc-qt4</command></term>
     698        <term><command>rcc</command></term>
    783699        <listitem>
    784700          <para>
    … …  
    786702          </para>
    787703          <indexterm zone="qt4 rcc-qt4">
    788             <primary sortas="b-rcc-qt4">rcc-qt4</primary>
     704            <primary sortas="b-rcc-qt4">rcc</primary>
    789705          </indexterm>
    790706        </listitem>
    … …  
    792708
    793709      <varlistentry id="uic-qt4">
    794         <term><command>uic-qt4</command></term>
     710        <term><command>uic</command></term>
    795711        <listitem>
    796712          <para>
    … …  
    798714          </para>
    799715          <indexterm zone="qt4 uic-qt4">
    800             <primary sortas="b-uic-qt4">uic-qt4</primary>
     716            <primary sortas="b-uic-qt4">uic</primary>
    801717          </indexterm>
    802718        </listitem>
    … …  
    804720
    805721      <varlistentry id="uic3-qt4">
    806         <term><command>uic3-qt4</command></term>
     722        <term><command>uic3</command></term>
    807723        <listitem>
    808724          <para>
    … …  
    812728          </para>
    813729          <indexterm zone="qt4 uic3-qt4">
    814             <primary sortas="b-uic3-qt4">uic3-qt4</primary>
     730            <primary sortas="b-uic3-qt4">uic3</primary>
    815731          </indexterm>
    816732        </listitem>
Note: See TracChangeset for help on using the changeset viewer.