Changeset c65ac49d


Ignore:
Timestamp:
07/24/2014 02:37:27 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
23f5584
Parents:
061d252
Message:

Sync Qt4 page with Qt5 one.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13611 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
x/lib
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • x/lib/colord-gtk-systemd.xml

    r061d252 rc65ac49d  
    153153        </seg>
    154154        <seg>
    155           /usr/share/gtk-doc/html/colord-gtk,
    156           /usr/include/colord-1/colord-gtk
     155          /usr/include/colord-1/colord-gtk and
     156          /usr/share/gtk-doc/html/colord-gtk
    157157        </seg>
    158158      </seglistitem>

  • x/lib/lib.xml

    r061d252 rc65ac49d  
    5555  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
    5656  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
    57   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
     57  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4-systemd.xml"/>
    5858  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-systemd.xml"/>
    5959  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>

  • x/lib/qt4-systemd.xml

    r061d252 rc65ac49d  
    2929
    3030  <sect2 role="package">
    31     <title>Introduction to Qt</title>
    32 
    33     <para>
    34       <application>Qt</application> is a cross-platform application
     31    <title>Introduction to Qt4</title>
     32
     33    <para>
     34      <application>Qt4</application> is a cross-platform application
    3535      framework that is widely used for developing application software
    36       with a graphical user interface (GUI) (in which cases Qt is classified
    37       as a widget toolkit), and also used for developing non-GUI programs such
    38       as command-line tools and consoles for servers. One of the major users
    39       of <application>Qt</application> is <application>KDE</application>.
     36      with a graphical user interface (GUI) (in which cases
     37      <application>Qt4</application> is classifiedas a widget toolkit), and
     38      also used for developing non-GUI programs such as command-line tools
     39      and consoles for servers. One of the major users
     40      of <application>Qt4</application> is <application>KDE</application>.
    4041    </para>
    4142
    … …  
    7677    </itemizedlist>
    7778
    78     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
     79    <bridgehead renderas="sect3">Qt4 Dependencies</bridgehead>
    7980
    8081    <bridgehead renderas="sect4">Required</bridgehead>
    … …  
    110111    </para>
    111112
     113    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
     114    <para role="optional">
     115      <xref linkend="qtchooser"/> (required if installing both
     116      Qt4 and Qt5)
     117    </para>
     118
    112119    <para condition="html" role="usernotes">User Notes:
    113120      <ulink url="&blfs-wiki;/qt4"/>
    … …  
    115122  </sect2>
    116123
    117   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../xincludes/qt-alternatives.xml"/>
     124
     125  <sect2 role="qt4-prefix">
     126    <title>Setting the installation prefix</title>
     127
     128    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
     129
     130    <para>
     131      If you want to install <application>Qt4</application>
     132      in <filename class="directory">/usr</filename>, set the
     133      following environment variable:
     134    </para>
     135
     136<screen><userinput>export QT4PREFIX=/usr</userinput></screen>
     137
     138    <para>
     139      The advantage of installing in
     140      <filename class="directory">/usr</filename> is that no additional
     141      configuration is required. The package files are distributed
     142      within several subdirectories of the
     143      <filename class="directory">/usr</filename> hierarchy. This is
     144      the method that most distributions use. The disadvantage for BLFS
     145      users is that this <application>Qt4</application> instance cannot
     146      be upgraded while it is in use. It also does not allow reverting
     147      to an existing, known working instance of
     148      <application>Qt4</application>.
     149    </para>
     150
     151    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
     152
     153    <para>
     154      If you want to install <application>Qt4</application>
     155      in a directory other than <filename
     156      class="directory">/usr</filename>, ie
     157      <filename class="directory">/opt/qt4</filename>, set
     158      the following environment variable:
     159    </para>
     160
     161<screen><userinput>export QT4PREFIX=/opt/qt4</userinput></screen>
     162
     163    <para>
     164      The advantage of installing <application>Qt4</application> in a
     165      custom directory such as <filename
     166      class="directory">/opt/qt4</filename> is that it keeps all the
     167      package files consolidated in a dedicated directory hierarchy. By
     168      using this method, an update can be made without overwriting a
     169      previous installation and users can easily revert to a previous
     170      version by changing one symbolic link or merely changing the
     171      PATH variable.
     172    </para>
     173
     174  </sect2>
     175
     176  <sect2 role="qt4-multi-install">
     177    <title>Dealing with multiple Qt versions</title>
     178
     179    <para>
     180      Both <application>Qt4</application> and
     181      <application>Qt5</application> executables have
     182      the same names and will overwrite each other if
     183      they are installed in the same prefix. To overcome
     184      such problem, BLFS offers <xref linkend="qtchooser"/>,
     185      an utility used to switch between different
     186      <application>Qt</application> versions.
     187    </para>
     188
     189    <para>
     190      If <xref linkend="qtchooser"/> is to be used or
     191      if installing both <application>Qt4</application>
     192      and <application>Qt5</application> in
     193      <filename class="directory">/usr</filename>, the
     194      executables need to be installed to a non-standard
     195      location in order to avoid the conflict with
     196      <application>Qt5</application> ones. To accomplish
     197      that, set the following environment variable:
     198    </para>
     199
     200<screen><userinput>export QT4BINDIR=$QT4PREFIX/lib/qt4/bin</userinput></screen>
     201
     202    <para>
     203      If you choose not to install <xref linkend="qtchooser"/>
     204      or if you are not going to install
     205      <application>Qt5</application>, simply set the bindir to
     206      a <filename class="directory">bin</filename> subdir of the
     207      default prefix by setting the following environment variable:
     208    </para>
     209
     210<screen><userinput>export QT4BINDIR=$QT4PREFIX/bin</userinput></screen>
     211
     212  </sect2>
    118213
    119214  <sect2 role="installation">
    120     <title>Installation of Qt</title>
     215    <title>Installation of Qt4</title>
    121216
    122217    <caution>
    … …  
    155250    src/gui/image/qgifhandler.cpp</userinput></screen>
    156251
    157 <!-- ==== Method 1 ====== -->
    158     <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
    159 
    160     <para>
    161       Install <application>Qt4</application> into the <filename
    162       class='directory'>/usr</filename> hierarchy by running the following
    163       commands:
    164     </para>
    165 
    166 <screen><userinput>export QT4LINK=/usr
    167 
    168 sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
     252    <para>
     253      Install <application>Qt4</application> by running the
     254      following commands:
     255    </para>
     256
     257<screen><userinput>sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    169258     config.tests/unix/libmng/libmng.cpp &amp;&amp;
    170259
    … …  
    172261     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
    173262
    174 ./configure -prefix         /usr                 \
    175             -bindir         /usr/bin             \
    176             -plugindir      /usr/lib/qt4/plugins \
    177             -importdir      /usr/lib/qt4/imports \
    178             -headerdir      /usr/include/qt4     \
    179             -datadir        /usr/share/qt4       \
    180             -sysconfdir     /etc/xdg             \
    181             -docdir         /usr/share/doc/qt4   \
    182             -demosdir       /usr/share/doc/qt4/demos    \
    183             -examplesdir    /usr/share/doc/qt4/examples \
    184             -translationdir /usr/share/qt4/translations \
     263./configure -prefix         $QT4PREFIX                        \
     264            -sysconfdir     /etc/xdg                          \
     265            -bindir         $QT4BINDIR                        \
     266            -plugindir      $QT4PREFIX/lib/qt4/plugins        \
     267            -importdir      $QT4PREFIX/lib/qt4/imports        \
     268            -headerdir      $QT4PREFIX/include/qt4            \
     269            -datadir        $QT4PREFIX/share/qt4              \
     270            -docdir         $QT4PREFIX/share/doc/qt4          \
     271            -translationdir $QT4PREFIX/share/qt4/translations \
     272            -demosdir       $QT4PREFIX/share/doc/qt4/demos    \
     273            -examplesdir    $QT4PREFIX/share/doc/qt4/examples \
    185274            -confirm-license   \
    186275            -opensource        \
    … …  
    191280            -no-phonon         \
    192281            -no-phonon-backend \
    193             -no-nis            \
    194282            -no-openvg         \
    195283            -nomake demos      \
    … …  
    211299<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
    212300
    213     <para>Now as the <systemitem class="username">root</systemitem> user:</para>
     301    <warning>
     302      <para>
     303        Make sure that <envar>QT4PREFIX</envar> and <envar>QT4BINDIR</envar>
     304        environment variables are set for the
     305        <systemitem class="username">root</systemitem> user too.
     306      </para>
     307    </warning>
     308
     309    <para>
     310      Now, as the <systemitem class="username">root</systemitem> user:
     311    </para>
    214312
    215313<screen role="root"><userinput>make install &amp;&amp;
    216 rm -rf /usr/tests</userinput></screen>
     314rm -rf $QT4PREFIX/tests</userinput></screen>
    217315
    218316    <para>
    … …  
    226324            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon; do
    227325
    228      [ -e /usr/lib/libQt${file}.prl ] &amp;&amp;
     326     [ -e $QT4PREFIX/lib/libQt${file}.prl ] &amp;&amp;
    229327     sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
    230          -i /usr/lib/libQt${file}.prl
     328         -i $QT4PREFIX/lib/libQt${file}.prl
    231329done
    232330unset file</userinput></screen>
    233331
    234 <!-- ==== Method 2 ====== -->
    235     <bridgehead renderas="sect3">Method 2: Installing in /opt/qt-&qt4-version;</bridgehead>
    236 
    237     <para>
    238       This section provides for installing Qt4 almost all of the files in the
    239       <filename class="directory">/opt</filename> directory.
    240     </para>
    241 
    242 <screen><userinput>export QT4DIR=/opt/qt-&qt4-version; &amp;&amp;
    243 export QT4LINK=/opt/qt4 &amp;&amp;
    244 
    245 sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
    246      config.tests/unix/libmng/libmng.cpp &amp;&amp;
    247 
    248 sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
    249      src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
    250 
    251 ./configure -prefix     $QT4DIR  \
    252             -sysconfdir /etc/xdg \
    253             -confirm-license     \
    254             -opensource          \
    255             -release             \
    256             -dbus-linked         \
    257             -openssl-linked      \
    258             -system-sqlite       \
    259             -plugin-sql-sqlite   \
    260             -no-phonon           \
    261             -no-phonon-backend   \
    262             -no-nis              \
    263             -no-openvg           \
    264             -nomake demos        \
    265             -nomake examples     \
    266             -optimized-qmake     &amp;&amp;
    267 
    268 make</userinput></screen>
    269 
    270     <para>
    271       Now, as the <systemitem class="username">root</systemitem> user:
    272     </para>
    273 
    274 <screen role="root"><userinput>make install
    275 ln -svfn $QT4DIR /opt/qt4</userinput></screen>
    276 
    277     <para>
    278       Remove references to the build directory from installed files by
    279       running the following command as the
    280       <systemitem class="username">root</systemitem> user:
    281     </para>
    282 
    283 <screen role="root"><userinput>for file in `basename -a -s .prl $QT4DIR/lib/lib*.prl`; do
    284        sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
    285               -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
    286               -i $QT4DIR/lib/${file}.prl
    287 
    288    perl -pi -e "s, -L$PWD/?\S+,,g" $QT4DIR/lib/pkgconfig/${file##lib}.pc
    289 done
    290 
    291 unset file</userinput></screen>
    292 
    293 <!-- ==== Common  ====== -->
    294     <bridgehead renderas="sect3">Continuing for Both Methods</bridgehead>
    295 
    296       <para>
    297         For all methods, install images and create the menu entries
    298         for installed applications.  Be sure that the <envar>QT4LINK</envar>
    299         variable is defined in root's environment and
    300         as the <systemitem class="username">root</systemitem> user:
    301       </para>
     332    <para>
     333      Install images and create the menu entries for installed
     334      applications by running the following commands
     335      as the <systemitem class="username">root</systemitem> user:
     336    </para>
    302337
    303338<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
    304                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
     339                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
    305340
    306341install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
    … …  
    308343
    309344install -v -Dm644 tools/designer/src/designer/images/designer.png \
    310                   /usr/share/pixmaps/designer-qt4.png  &amp;&amp;
     345                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
    311346
    312347install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
    313                   /usr/share/pixmaps/linguist-qt4.png  &amp;&amp;
     348                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
    314349
    315350install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
    316351                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
    317352
    318 install -dm755 /usr/share/applications &amp;&amp;
     353install -v -dm755 /usr/share/applications &amp;&amp;
    319354
    320355cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
    … …  
    322357Name=Qt4 Assistant
    323358Comment=Shows Qt4 documentation and examples
    324 Exec=$QT4LINK/bin/assistant
     359Exec=$QT4BINDIR/assistant
    325360Icon=assistant-qt4.png
    326361Terminal=false
    … …  
    334369Name=Qt4 Designer
    335370Comment=Design GUIs for Qt4 applications
    336 Exec=$QT4LINK/bin/designer
     371Exec=$QT4BINDIR/designer
    337372Icon=designer-qt4.png
    338373MimeType=application/x-designer;
    … …  
    347382Name=Qt4 Linguist
    348383Comment=Add translations to Qt4 applications
    349 Exec=$QT4LINK/bin/linguist
     384Exec=$QT4BINDIR/linguist
    350385Icon=linguist-qt4.png
    351386MimeType=text/vnd.trolltech.linguist;application/x-linguist;
    … …  
    361396GenericName=D-Bus Debugger
    362397Comment=Debug D-Bus applications
    363 Exec=$QT4LINK/bin/qdbusviewer
     398Exec=$QT4BINDIR/qdbusviewer
    364399Icon=qdbusviewer-qt4.png
    365400Terminal=false
    … …  
    373408Name=Qt4 Config
    374409Comment=Configure Qt4 behavior, styles, fonts
    375 Exec=$QT4LINK/bin/qtconfig
     410Exec=$QT4BINDIR/qtconfig
    376411Icon=qt4logo.png
    377412Terminal=false
    … …  
    381416EOF</userinput></screen>
    382417
     418    <para>
     419      Some packages look for <application>Qt4</application> executables
     420      with <filename>-qt4</filename> suffix. Run the following command
     421      as the <systemitem class="username">root</systemitem> user to
     422      create the necessary symlinks:
     423    </para>
     424
     425<screen role="root"><userinput>for file in $QT4BINDIR/*; do
     426  ln -sfrv $file /usr/bin/$(basename $file)-qt4
     427done</userinput></screen>
     428
    383429  </sect2>
    384430
    … …  
    416462      <parameter>-system-sqlite</parameter>: This switch enables use
    417463      the system version of <application>SQLite</application>.
    418     </para>
    419 
    420     <para>
    421       <parameter>-no-nis</parameter>: This switch disables support
    422       for Network Information Service (NIS) which has been
    423       deprecated in recent versions of <application>Glibc</application>.
    424464    </para>
    425465
    … …  
    451491    </para>
    452492
    453     <para>
    454       <option>-no-dbus</option>: Use this switch if you don't have
    455       <application>D-Bus</application> installed.
    456     </para>
    457 
    458493  </sect2>
    459494
    460495  <sect2 role="configuration">
    461     <title>Configuring Qt</title>
     496    <title>Configuring Qt4</title>
    462497
    463498    <sect3 id="qt4-config">
    464499      <title>Configuration Information</title>
    465500
     501      <note>
     502        <para>
     503          If you have installed <application>Qt4</application>
     504          in <filename class="directory">/usr</filename> you
     505          can skip this section.
     506        </para>
     507      </note>
     508
    466509      <para>
    467         If you installed <application>Qt</application> in /usr,
    468         create an environment variable needed by certain packages.
    469         As the <systemitem class="username">root</systemitem> user:
     510        If you installed <application>Qt4</application> in a location other
     511        than <filename class="directory">/usr</filename>, you need to update the
     512        following configuration files so that <application>Qt5</application> is
     513        correctly found by other packages and system processes.
     514      </para>
     515
     516      <para>
     517        As the <systemitem class="username">root</systemitem> user, update
     518        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
     519        run-time cache file:
     520      </para>
     521
     522<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
     523<literal># Begin Qt4 addition
     524
     525$QT4PREFIX/lib
     526
     527# End Qt4 addition</literal>
     528EOF
     529
     530ldconfig</userinput></screen>
     531
     532      <indexterm zone="qt4 qt4-config">
     533        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
     534      </indexterm>
     535
     536      <para>
     537        If you have installed <xref linkend="qtchooser"/>, create
     538        the <filename>/etc/profile.d/qt4.sh</filename> file by
     539        running the following command as the
     540        <systemitem class="username">root</systemitem> user:
    470541      </para>
    471542
    … …  
    473544<literal># Begin /etc/profile.d/qt4.sh
    474545
    475 QT4DIR=/usr
    476 export QT4DIR
     546pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
    477547
    478548# End /etc/profile.d/qt4.sh</literal>
    479549EOF</userinput></screen>
    480550
    481    <para>
    482       If you installed <application>Qt</application> in a location other
    483       than /usr, you need to update the following configuration files so
    484       that <application>Qt</application> is correctly found by other packages
    485       and system processes.</para>
    486    
    487       <para>As the <systemitem class="username">root</systemitem> user, update
    488       the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
    489       run-time cache file:
    490    </para>
    491    
    492 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
    493 <literal># Begin Qt addition
    494    
    495 /opt/qt4/lib
    496    
    497 # End Qt addition</literal>
    498 EOF
    499 
    500 ldconfig</userinput></screen>
    501    
    502    <indexterm zone="qt4 qt4-config">
    503       <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
    504    </indexterm>
    505    
    506    <para>
    507       As the <systemitem class="username">root</systemitem> user, create
    508       the <filename>/etc/profile.d/qt4.sh</filename> file:
    509    </para>
    510    
     551      <para>
     552        If you have not installed <xref linkend="qtchooser"/>,
     553        create the <filename>/etc/profile.d/qt4.sh</filename>
     554        file by running the following command as the
     555        <systemitem class="username">root</systemitem> user:
     556      </para>
     557
    511558<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
    512559<literal># Begin /etc/profile.d/qt4.sh
    513    
    514 QT4DIR=/opt/qt4
    515    
    516 pathappend /opt/qt4/bin           PATH
    517 pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
    518    
    519 export QT4DIR
    520    
     560
     561pathappend $QT4BINDIR               PATH
     562pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
     563
    521564# End /etc/profile.d/qt4.sh</literal>
    522565EOF</userinput></screen>
    523566
     567      <note>
     568        <para>
     569          If <xref linkend="qtchooser"/> is not installed and you
     570          also have <application>Qt5</application> installed,
     571          you will need to manually adjust the <envar>PATH</envar>
     572          variable depending on which <application>Qt</application>
     573          version is needed.
     574        </para>
     575      </note>
    524576
    525577    </sect3>
    526    
    527     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    528                 href="../../xincludes/setqt.xml"/>
     578
    529579  </sect2>
    530580
    … …  
    557607        </seg>
    558608        <seg>
    559           /usr/include/qt4,
    560           /usr/lib/qt4,
    561           /usr/share/doc/qt4, and
    562           /usr/share/qt4
    563           OR
    564           /opt/qt4 and
    565           /opt/qt-&qt4-version;
     609          $QT4PREFIX/include/qt4,
     610          $QT4PREFIX/lib/qt4,
     611          $QT4PREFIX/share/doc/qt4, and
     612          $QT4PREFIX/share/qt4
    566613        </seg>
    567614      </seglistitem>

  • x/lib/qt5-systemd.xml

    r061d252 rc65ac49d  
    9898      <xref linkend="gst-plugins-base"/>,
    9999      <xref linkend="harfbuzz"/>,
    100       <xref linkend="icu"/> (required for QtWebKit),
     100      <xref linkend="icu"/> (unicode support, also required for QtWebKit),
    101101      <xref linkend="libjpeg"/>,
    102102      <xref linkend="libmng"/>,
    … …  
    106106      <xref linkend="openssl"/>,
    107107      <xref linkend="pcre"/>,
    108       <xref linkend="sqlite"/> and
    109       <xref linkend="ruby"/> (required for QtWebKit)
     108      <xref linkend="ruby"/> (required for QtWebKit), and
     109      <xref linkend="sqlite"/>
    110110    </para>
    111111
    … …  
    134134  </sect2>
    135135
    136   <sect2 role="qtprefix">
     136  <sect2 role="qt5-prefix">
    137137    <title>Setting the installation prefix</title>
    138138
    … …  
    154154      <filename class="directory">/usr</filename> hierarchy. This is
    155155      the method that most distributions use. The disadvantage for BLFS
    156       users is that this <application>Qt</application> instance cannot
     156      users is that this <application>Qt5</application> instance cannot
    157157      be upgraded while it is in use. It also does not allow reverting
    158158      to an existing, known working instance of
    … …  
    185185  </sect2>
    186186
    187   <sect2 role="multi-install">
     187  <sect2 role="qt5-multi-install">
    188188    <title>Dealing with multiple Qt versions</title>
    189189
    … …  
    313313    </para>
    314314
    315 <screen role="root"><userinput>install -v -dm755 /usr/share/pixmaps &amp;&amp;
    316 
    317 install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
     315<screen role="root"><userinput>install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
    318316                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
    319317
    … …  
    521519      <note>
    522520        <para>
    523           If you also have <application>Qt4</application> installed,
     521          If <xref linkend="qtchooser"/> is not installed and you
     522          also have <application>Qt4</application> installed,
    524523          you will need to manually adjust the <envar>PATH</envar>
    525524          variable depending on which <application>Qt</application>
Note: See TracChangeset for help on using the changeset viewer.