Changeset d99d728


Ignore:
Timestamp:
07/21/2012 04:40:52 PM (12 years ago)
Author:
Ragnar Thomsen <rthomsen@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 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:
d21252d
Parents:
5eaf9af8
Message:

Change Qt4 to just Qt in xml filename and references.

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

Files:
21 edited
1 moved

Legend:

Unmodified
Added
Removed

  • general.ent

    r5eaf9af8 rd99d728  
    689689<!ENTITY pango-version                "1.30.1">
    690690<!ENTITY pangomm-version              "2.28.4">
    691 <!-- <!ENTITY qt-version                   "3.3.8d"> -->
    692 <!ENTITY qt4-version                  "4.8.2">
     691<!ENTITY qt-version                   "4.8.2">
    693692<!ENTITY shared-mime-info-version     "1.0">
    694693<!ENTITY startup-notification-version "0.12">

  • general/genlib/libdbusmenuqt.xml

    r5eaf9af8 rd99d728  
    7070    <bridgehead renderas="sect4">Required</bridgehead>
    7171    <para role="required">
    72     <xref linkend="qt4"/>
     72    <xref linkend="qt"/>
    7373    </para>
    7474

  • general/genlib/qca.xml

    r5eaf9af8 rd99d728  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="qt4"/> and
     74    <xref linkend="qt"/> and
    7575    <xref linkend="which"/>
    7676    </para>

  • general/genutils/graphviz.xml

    r5eaf9af8 rd99d728  
    111111      <xref linkend="gs"/>,
    112112      <xref linkend="gtk2"/> and
    113       <xref linkend="qt4"/>
     113      <xref linkend="qt"/>
    114114    </para>
    115115

  • general/genutils/pinentry.xml

    r5eaf9af8 rd99d728  
    8080    <para role="optional"><!-- <xref linkend="GTK"/>, -->
    8181    <xref linkend="gtk2"/>,
    82     <!-- <xref linkend="qt"/> or --><xref linkend="qt4"/>, and
     82    <xref linkend="qt"/>, and
    8383    <xref linkend="libcap2"/></para>
    8484

  • general/graphlib/poppler.xml

    r5eaf9af8 rd99d728  
    129129      <xref linkend="libxml2"/>,
    130130      <xref linkend="openjpeg"/> and
    131       <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
     131      <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
    132132      is needed for PDF support in <application>Okular</application>).
    133133    </para>

  • general/prog/cmake.xml

    r5eaf9af8 rd99d728  
    7373    <para role="optional">
    7474      <xref linkend="subversion"/> (for testing) and
    75       <xref linkend="qt4"/> (for the Qt-based GUI)
     75      <xref linkend="qt"/> (for the Qt-based GUI)
    7676    </para>
    7777

  • general/prog/doxygen.xml

    r5eaf9af8 rd99d728  
    7474
    7575    <bridgehead renderas="sect4">Optional</bridgehead>
    76     <para role="optional"><xref linkend="qt4"/> (for doxywizard),
     76    <para role="optional"><xref linkend="qt"/> (for doxywizard),
    7777    <xref linkend="graphviz"/>,
    7878    <xref linkend="python2"/>,
    … …  
    8787  <sect2 role="installation">
    8888    <title>Installation of Doxygen</title>
    89 
    90 <!--
    91     <note><para>If you have both <xref linkend='qt'/> and <xref linkend='qt4'/>
    92     installed, be sure to set the environment variable QTDIR to point to the
    93     <application>Qt</application> top level directory if you add the
    94     <option>- -with-doxywizard</option> option.</para></note> -->
    9589
    9690    <para>Install <application>Doxygen</application> by running the following

  • general/sysutils/strigi.xml

    r5eaf9af8 rd99d728  
    7474    <bridgehead renderas="sect4">Recommended</bridgehead>
    7575    <para role="recommended">
    76     <xref linkend="qt4"/> and
     76    <xref linkend="qt"/> and
    7777    <xref linkend="dbus"/>   
    7878    </para>

  • kde4/core/attica.xml

    r5eaf9af8 rd99d728  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt4"/>
     73    <xref linkend="qt"/>
    7474    </para>
    7575

  • kde4/core/automoc4.xml

    r5eaf9af8 rd99d728  
    7373    <para role="required">
    7474    <xref linkend="cmake"/> and
    75     <xref linkend="qt4"/>
     75    <xref linkend="qt"/>
    7676    </para>
    7777

  • kde4/core/kde4workspace.xml

    r5eaf9af8 rd99d728  
    110110    <title>Installation of Kde-workspace</title>
    111111
    112     <para>Install <application>Kde4-workspace</application> by running the following
     112    <para>Install <application>Kde-workspace</application> by running the following
    113113    commands:</para>
    114114

  • kde4/core/phonon.xml

    r5eaf9af8 rd99d728  
    9090    <title>Installation of Phonon</title>
    9191
    92     <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
     92    <para>Make sure that <xref linkend="qt"/> is compiled without the bundled
    9393    <application>Phonon</application> library. This package provides
    9494    a better implementation.</para>
    … …  
    118118
    119119  </sect2>
    120 
    121 <!-- this is a patch slackware uses. Cannot see that we need it too
    122        <para>Execute a modification to enable <ulink url="http://www.riverbankcomputing.com/software/pyqt/">pyQT4</ulink>
    123        to find the headers:</para>
    124        
    125 <screen><userinput>sed -i -e 's#{includedir}$#&amp; -I\${includedir}/phonon#' \
    126           &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
    127 -->
    128120
    129121<!--

  • kde4/core/qimageblitz.xml

    r5eaf9af8 rd99d728  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt4"/>
     73    <xref linkend="qt"/>
    7474    </para>
    7575

  • multimedia/videoutils/vlc.xml

    r5eaf9af8 rd99d728  
    9090      <xref linkend="libmad"/>,
    9191      <xref linkend="liba52"/> and
    92       <xref linkend="qt4"/> (<application>Qt4</application> is required for the
    93       graphical user interface. Without Qt4 you will only be able to use the
     92      <xref linkend="qt"/> (<application>Qt</application> is required for the
     93      graphical user interface. Without Qt you will only be able to use the
    9494      command line or <application>ncurses</application> interface)
    9595    </para>
    … …  
    282282          <para>
    283283            is a script to run <application>VLC</application> with the
    284             <application>QT4</application> interface.
     284            <application>Qt</application> interface.
    285285          </para>
    286286          <indexterm zone="vlc qvlc">

  • networking/netutils/avahi.xml

    r5eaf9af8 rd99d728  
    9191    <bridgehead renderas="sect4">Optional</bridgehead>
    9292    <para role="optional">
    93       <xref linkend="qt4"/>
     93      <xref linkend="qt"/>
    9494    </para>
    9595

  • server/other/soprano.xml

    r5eaf9af8 rd99d728  
    7373    <para role="required">
    7474    <xref linkend="cmake"/>,
    75     <xref linkend="qt4"/>,
     75    <xref linkend="qt"/>,
    7676    <xref linkend="dbus"/> and
    7777    <xref linkend="redland"/>

  • x/lib/cairo.xml

    r5eaf9af8 rd99d728  
    126126      <xref linkend="mesalib"/>,
    127127      <xref linkend="poppler"/> (for testing the PDF backend),
    128       <xref linkend="qt4"/>,
     128      <xref linkend="qt"/>,
    129129      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
    130130      <ulink url="http://www.valgrind.org">Valgrind</ulink>.

  • x/lib/lib.xml

    r5eaf9af8 rd99d728  
    5151  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
    53   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
     53  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
    5555  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>

  • x/lib/qt.xml

    r5eaf9af8 rd99d728  
    55  %general-entities;
    66
    7   <!ENTITY qt4-download-http "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
    8   <!ENTITY qt4-download-ftp  " ">
    9   <!ENTITY qt4-md5sum        "3c1146ddf56247e16782f96910a8423b">
    10   <!ENTITY qt4-size          "228 MB">
    11   <!ENTITY qt4-buildsize     "1.8 GB (full), 619 (essential)">
    12   <!ENTITY qt4-time          "69 SBU (full), 54 SBU (essential)">
     7  <!ENTITY qt-download-http "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt-version;.tar.gz">
     8  <!ENTITY qt-download-ftp  " ">
     9  <!ENTITY qt-md5sum        "3c1146ddf56247e16782f96910a8423b">
     10  <!ENTITY qt-size          "228 MB">
     11  <!ENTITY qt-buildsize     "1.8 GB (full), 619 (essential)">
     12  <!ENTITY qt-time          "69 SBU (full), 54 SBU (essential)">
    1313]>
    1414
    15 <sect1 id="qt4" xreflabel="Qt-&qt4-version;">
    16   <?dbhtml filename="qt4.html" ?>
     15<sect1 id="qt" xreflabel="Qt-&qt-version;">
     16  <?dbhtml filename="qt.html" ?>
    1717
    1818  <sect1info>
    … …  
    2121  </sect1info>
    2222
    23   <title>Qt-&qt4-version;</title>
    24 
    25   <indexterm zone="qt4">
    26     <primary sortas="a-qt4">Qt4</primary>
     23  <title>Qt-&qt-version;</title>
     24
     25  <indexterm zone="qt">
     26    <primary sortas="a-qt">Qt</primary>
    2727  </indexterm>
    2828
    … …  
    4242    <itemizedlist spacing="compact">
    4343      <listitem>
    44         <para>Download (HTTP): <ulink url="&qt4-download-http;"/></para>
    45       </listitem>
    46       <listitem>
    47         <para>Download (FTP): <ulink url="&qt4-download-ftp;"/></para>
    48       </listitem>
    49       <listitem>
    50         <para>Download MD5 sum: &qt4-md5sum;</para>
    51       </listitem>
    52       <listitem>
    53         <para>Download size: &qt4-size;</para>
    54       </listitem>
    55       <listitem>
    56         <para>Estimated disk space required: &qt4-buildsize;</para>
    57       </listitem>
    58       <listitem>
    59         <para>Estimated build time: &qt4-time;</para>
     44        <para>Download (HTTP): <ulink url="&qt-download-http;"/></para>
     45      </listitem>
     46      <listitem>
     47        <para>Download (FTP): <ulink url="&qt-download-ftp;"/></para>
     48      </listitem>
     49      <listitem>
     50        <para>Download MD5 sum: &qt-md5sum;</para>
     51      </listitem>
     52      <listitem>
     53        <para>Download size: &qt-size;</para>
     54      </listitem>
     55      <listitem>
     56        <para>Estimated disk space required: &qt-buildsize;</para>
     57      </listitem>
     58      <listitem>
     59        <para>Estimated build time: &qt-time;</para>
    6060      </listitem>
    6161    </itemizedlist>
    … …  
    6666      <listitem>
    6767        <para>GLib 2.32 patch: <ulink
    68         url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch"/>
     68        url="&patch-root;/qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch"/>
    6969        </para>
    7070       </listitem>
    … …  
    103103
    104104    <para condition="html" role="usernotes">User Notes:
    105     <ulink url="&blfs-wiki;/qt4"/></para>
     105    <ulink url="&blfs-wiki;/qt"/></para>
    106106
    107107  </sect2>
    … …  
    160160    of <filename class='directory'>/usr/local/qt/</filename>, however the
    161161    procedure below puts the files in <filename
    162     class='directory'>/opt/qt-&qt4-version;/</filename>
     162    class='directory'>/opt/qt-&qt-version;/</filename>
    163163    and then creates a symbolic link to <filename>/opt/qt/</filename>.</para>
    164164   
    … …  
    166166    following commands:</para>
    167167
    168 <screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &amp;&amp;
     168<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch &amp;&amp;
    169169sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &amp;&amp;
    170 ./configure -prefix /opt/qt-&qt4-version;  \
     170./configure -prefix /opt/qt-&qt-version;  \
    171171            -release               \
    172172            -nomake examples       \
    … …  
    195195    again as the <systemitem class="username">root</systemitem> user issue:</para>
    196196
    197 <screen role="root"><userinput>ln -svfn qt-&qt4-version; /opt/qt</userinput></screen>
     197<screen role="root"><userinput>ln -svfn qt-&qt-version; /opt/qt</userinput></screen>
    198198
    199199  </sect2>
    … …  
    253253    <title>Configuring Qt</title>
    254254
    255     <sect3 id='qt4-config'>
     255    <sect3 id='qt-config'>
    256256      <title>Configuration Information</title>
    257257
    … …  
    274274ldconfig</userinput></screen>
    275275
    276       <indexterm zone="qt4 qt4-config">
     276      <indexterm zone="qt qt-config">
    277277        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
    278278      </indexterm>
    … …  
    319319        <filename class='directory'>/opt/qt/plugins</filename></seg>
    320320
    321         <seg>/opt/qt-&qt4-version;</seg>
     321        <seg>/opt/qt-&qt-version;</seg>
    322322      </seglistitem>
    323323    </segmentedlist>
    … …  
    328328      <?dbhtml list-presentation="table"?>
    329329
    330       <varlistentry id="qt4-assistant">
     330      <varlistentry id="qt-assistant">
    331331        <term><command>assistant</command></term>
    332332        <listitem>
    333333          <para>is a tool for presenting on-line documentation.</para>
    334           <indexterm zone="qt4 qt4-assistant">
     334          <indexterm zone="qt qt-assistant">
    335335            <primary sortas="b-assistant">assistant</primary>
    336336          </indexterm>
    … …  
    338338      </varlistentry>
    339339
    340       <varlistentry id="qt4-designer">
     340      <varlistentry id="qt-designer">
    341341        <term><command>designer</command></term>
    342342        <listitem>
    … …  
    345345          layout, support for custom widgets, and an advanced
    346346          property editor.</para>
    347           <indexterm zone="qt4 qt4-designer">
     347          <indexterm zone="qt qt-designer">
    348348            <primary sortas="b-designer">designer</primary>
    349349          </indexterm>
    … …  
    351351      </varlistentry>
    352352
    353       <varlistentry id="qt4-linguist">
     353      <varlistentry id="qt-linguist">
    354354        <term><command>linguist</command></term>
    355355        <listitem>
    356356          <para>provides support for translating applications into
    357357          local languages.</para>
    358           <indexterm zone="qt4 qt4-linguist">
     358          <indexterm zone="qt qt-linguist">
    359359            <primary sortas="b-linguist">linguist</primary>
    360360          </indexterm>
    … …  
    362362      </varlistentry>
    363363
    364       <varlistentry id="qt4-lrelease">
     364      <varlistentry id="qt-lrelease">
    365365        <term><command>lrelease</command></term>
    366366        <listitem>
    367367          <para>is a simple command line tool. It reads a Qt project
    368368          file and produces message files used by the application.</para>
    369           <indexterm zone="qt4 qt4-lrelease">
     369          <indexterm zone="qt qt-lrelease">
    370370            <primary sortas="b-lrelease">lrelease</primary>
    371371          </indexterm>
    … …  
    373373      </varlistentry>
    374374
    375       <varlistentry id="qt4-lupdate">
     375      <varlistentry id="qt-lupdate">
    376376        <term><command>lupdate</command></term>
    377377        <listitem>
    … …  
    380380          interface files, and produces or updates the translation
    381381          files listed in the project file.</para>
    382           <indexterm zone="qt4 qt4-lupdate">
     382          <indexterm zone="qt qt-lupdate">
    383383            <primary sortas="b-lupdate">lupdate</primary>
    384384          </indexterm>
    … …  
    386386      </varlistentry>
    387387
    388       <varlistentry id="qt4-moc">
     388      <varlistentry id="qt-moc">
    389389        <term><command>moc</command></term>
    390390        <listitem>
    391391          <para>generates Qt meta object support code.</para>
    392           <indexterm zone="qt4 qt4-moc">
     392          <indexterm zone="qt qt-moc">
    393393            <primary sortas="b-moc">moc</primary>
    394394          </indexterm>
    … …  
    396396      </varlistentry>
    397397
    398       <varlistentry id="qt4-pixeltool">
     398      <varlistentry id="qt-pixeltool">
    399399        <term><command>pixeltool</command></term>
    400400        <listitem>
    401401          <para>is a desktop magnifier and as you move your mouse around
    402402          the screen it will show the magnified contents in its window.</para>
    403           <indexterm zone="qt4 qt4-pixeltool">
     403          <indexterm zone="qt qt-pixeltool">
    404404            <primary sortas="b-pixeltool">pixeltool</primary>
    405405          </indexterm>
    … …  
    407407      </varlistentry>
    408408
    409       <varlistentry id="qt4-qmake">
     409      <varlistentry id="qt-qmake">
    410410        <term><command>qmake</command></term>
    411411        <listitem>
    412412          <para>qmake uses information stored in project files to
    413413          determine what should go in the makefiles it generates.</para>
    414           <indexterm zone="qt4 qt4-qmake">
     414          <indexterm zone="qt qt-qmake">
    415415            <primary sortas="b-qmake">qmake</primary>
    416416          </indexterm>
    … …  
    418418      </varlistentry>
    419419
    420       <varlistentry id="qt4-qt3to4">
     420      <varlistentry id="qt-qt3to4">
    421421        <term><command>qt3to4</command></term>
    422422        <listitem>
    423423          <para>qt3to4 is a tool to help update Qt3 code to Qt4.</para>
    424           <indexterm zone="qt4 qt4-qt3to4">
     424          <indexterm zone="qt qt-qt3to4">
    425425            <primary sortas="b-qt3to4">qt3to4</primary>
    426426          </indexterm>
    … …  
    428428      </varlistentry>
    429429
    430       <varlistentry id="qt4-qtconfig">
     430      <varlistentry id="qt-qtconfig">
    431431        <term><command>qtconfig</command></term>
    432432        <listitem>
    433433          <para>is used to customize the appearance of Qt applications.</para>
    434           <indexterm zone="qt4 qt4-qtconfig">
     434          <indexterm zone="qt qt-qtconfig">
    435435            <primary sortas="b-qtconfig">qtconfig</primary>
    436436          </indexterm>
    … …  
    438438      </varlistentry>
    439439
    440       <varlistentry id="qt4-qtdemo">
     440      <varlistentry id="qt-qtdemo">
    441441        <term><command>qtdemo</command></term>
    442442        <listitem>
    443443          <para>is a portal into various demonstrations of Qt
    444444          applications.</para>
    445           <indexterm zone="qt4 qt4-qtdemo">
     445          <indexterm zone="qt qt-qtdemo">
    446446            <primary sortas="b-qtdemo">qtdemo</primary>
    447447          </indexterm>
    … …  
    449449      </varlistentry>
    450450
    451       <varlistentry id="qt4-rcc">
     451      <varlistentry id="qt-rcc">
    452452        <term><command>rcc</command></term>
    453453        <listitem>
    454454          <para>is a resource compiler used in conjunction with designer.</para>
    455           <indexterm zone="qt4 qt4-rcc">
     455          <indexterm zone="qt qt-rcc">
    456456            <primary sortas="b-rcc">rcc</primary>
    457457          </indexterm>
    … …  
    459459      </varlistentry>
    460460
    461       <varlistentry id="qt4-uic">
     461      <varlistentry id="qt-uic">
    462462        <term><command>uic</command></term>
    463463        <listitem>
    464464          <para>is a Qt user interface compiler.</para>
    465           <indexterm zone="qt4 qt4-uic">
     465          <indexterm zone="qt qt-uic">
    466466            <primary sortas="b-uic">uic</primary>
    467467          </indexterm>
    … …  
    469469      </varlistentry>
    470470
    471       <varlistentry id="qt4-uic3">
     471      <varlistentry id="qt-uic3">
    472472        <term><command>uic3</command></term>
    473473        <listitem>
    … …  
    475475          user interface files generated by the Qt3
    476476          version of designer.</para>
    477           <indexterm zone="qt4 qt4-uic3">
     477          <indexterm zone="qt qt-uic3">
    478478            <primary sortas="b-uic3">uic3</primary>
    479479          </indexterm>

  • xsoft/other/gnash.xml

    r5eaf9af8 rd99d728  
    9494      <xref linkend="libogg"/>,
    9595      <xref linkend="libvorbis"/>,
    96       <xref linkend="qt4"/>,
     96      <xref linkend="qt"/>,
    9797      <xref linkend="speex"/>,
    9898      <xref linkend="wget"/>,

  • xsoft/other/transmission.xml

    r5eaf9af8 rd99d728  
    8989      <xref linkend="gtk3"/> (if both Gtk+ 2 and Gtk+ 3 are installed, configure
    9090      defaults to using Gtk+ 3), or
    91       <xref linkend="qt4"/>.
     91      <xref linkend="qt"/>.
    9292    </para>
    9393
    … …  
    114114
    115115    <para>
    116       If you have installed <xref linkend="qt4"/> and would like to compile the
     116      If you have installed <xref linkend="qt"/> and would like to compile the
    117117      Qt GUI:
    118118    </para>
Note: See TracChangeset for help on using the changeset viewer.