Changeset 7af92fe5


Ignore:
Timestamp:
06/02/2013 07:23:30 PM (9 years ago)
Author:
Krejzi <krejzi@…>
Branches:
10.0, 10.1, 11.0, 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, ken/refactor-virt, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, upgradedb, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
ad24d3e1
Parents:
88647e80
Message:

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.

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

Files:
1 added
1 deleted
30 edited

Legend:

Unmodified
Added
Removed
  • archive/kde/add/kdeaccessibility.xml

    r88647e80 r7af92fe5  
    112112
    113113./configure --prefix=$TRINITY_PREFIX \
    114             --with-qt-dir=$QTDIR     \
     114            --with-qt4-dir=$QTDIR     \
    115115            --enable-closure         \
    116116            --with-alsa              \
  • archive/kde/add/kdegames.xml

    r88647e80 r7af92fe5  
    9292
    9393./configure --prefix=$TRINITY_PREFIX                      \
    94             --with-qt-dir=$QTDIR                          \
     94            --with-qt4-dir=$QTDIR                          \
    9595            --enable-closure                              \
    9696            --with-extra-includes=$TRINITY_PREFIX/include \
  • archive/kde/add/kdemultimedia.xml

    r88647e80 r7af92fe5  
    124124
    125125./configure --prefix=$TRINITY_PREFIX                         \
    126             --with-qt-dir=$QTDIR                             \
     126            --with-qt4-dir=$QTDIR                             \
    127127            --enable-closure                                 \
    128128            --with-vorbis                                    \
  • archive/kde/add/kdetoys.xml

    r88647e80 r7af92fe5  
    8888
    8989./configure --prefix=$TRINITY_PREFIX                      \
    90             --with-qt-dir=$QTDIR                          \
     90            --with-qt4-dir=$QTDIR                          \
    9191            --enable-closure                              \
    9292            --with-extra-libs=$TRINITY_PREFIX/lib         &amp;&amp;
  • archive/kde/add/kdeutils.xml

    r88647e80 r7af92fe5  
    121121
    122122./configure --prefix=$TRINITY_PREFIX                      \
    123             --with-qt-dir=$QTDIR                          \
     123            --with-qt4-dir=$QTDIR                          \
    124124            --enable-closure                              \
    125125            --with-extra-includes=$TRINITY_PREFIX/include \
  • general.ent

    r88647e80 r7af92fe5  
    563563<!ENTITY pangox-version               "0.0.2">
    564564<!ENTITY pangomm-version              "2.28.4">
    565 <!ENTITY qt-version                   "4.8.4">
     565<!ENTITY qt4-version                  "4.8.4">
    566566<!ENTITY shared-mime-info-version     "1.1">
    567567<!ENTITY startup-notification-version "0.12">
     
    570570
    571571<!ENTITY gtk2-libdir                  "2.0/2.10.0">
    572 <!ENTITY qt-dir                       "$QTDIR">
     572<!ENTITY qt4-dir                       "$QTDIR">
    573573
    574574<!-- Chapter 26 -->
  • general/genlib/libdbusmenuqt.xml

    r88647e80 r7af92fe5  
    7070    <bridgehead renderas="sect4">Required</bridgehead>
    7171    <para role="required">
    72     <xref linkend="qt"/>
     72    <xref linkend="qt4"/>
    7373    </para>
    7474
     
    9292<screen><userinput>mkdir build &amp;&amp;
    9393cd build &amp;&amp;
    94 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     94cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9595      -DWITH_DOC=OFF .. &amp;&amp;
    9696make</userinput></screen>
     
    126126        <seg>None</seg>
    127127        <seg>libdbusmenu-qt.so</seg>
    128         <seg>&qt-dir;/include/dbusmenu-qt</seg>
     128        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
    129129      </seglistitem>
    130130    </segmentedlist>
  • general/genlib/qca.xml

    r88647e80 r7af92fe5  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="qt"/> and
     74    <xref linkend="qt4"/> and
    7575    <xref linkend="which"/>
    7676    </para>
     
    8888
    8989<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
    90 ./configure --prefix=&qt-dir; \
     90./configure --prefix=&qt4-dir; \
    9191            --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
    9292make</userinput></screen>
     
    124124        <seg>qcatool2 and qcatool2.debug</seg>
    125125        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
    126         <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
     126        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
    127127      </seglistitem>
    128128    </segmentedlist>
  • general/genlib/qjson.xml

    r88647e80 r7af92fe5  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="qt"/> and
     77      <xref linkend="qt4"/> and
    7878      <xref linkend="cmake"/>
    7979    </para>   
     
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     96cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9797      -DCMAKE_BUILD_TYPE=Release \
    9898      .. &amp;&amp;
     
    126126        </seg>
    127127        <seg>
    128           &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
     128          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
    129129        </seg>
    130130      </seglistitem>
  • general/genutils/graphviz.xml

    r88647e80 r7af92fe5  
    101101      <xref linkend="gs"/>,
    102102      <xref linkend="gtk2"/> and
    103       <xref linkend="qt"/>
     103      <xref linkend="qt4"/>
    104104    </para>
    105105
  • general/genutils/pinentry.xml

    r88647e80 r7af92fe5  
    7272      <xref linkend="gtk2"/>,
    7373      <xref linkend="libcap2"/> and
    74       <xref linkend="qt"/>
     74      <xref linkend="qt4"/>
    7575    </para>
    7676
  • general/graphlib/poppler.xml

    r88647e80 r7af92fe5  
    132132      <xref linkend="libxml2"/>,
    133133      <xref linkend="openjpeg"/> and
    134       <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
     134      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
    135135      is needed for PDF support in <application>Okular</application>).
    136136    </para>
  • general/prog/cmake.xml

    r88647e80 r7af92fe5  
    8787    <para role="optional">
    8888      <xref linkend="subversion"/> (for testing) and
    89       <xref linkend="qt"/> (for the Qt-based GUI)
     89      <xref linkend="qt4"/> (for the Qt-based GUI)
    9090    </para>
    9191
  • general/prog/doxygen.xml

    r88647e80 r7af92fe5  
    9494      <xref linkend="gs"/>,
    9595      <xref linkend="python2"/>,
    96       <xref linkend="qt"/> (for doxywizard) and
     96      <xref linkend="qt4"/> (for doxywizard) and
    9797      <xref linkend="texlive"/>
    9898    </para>
  • general/sysutils/strigi.xml

    r88647e80 r7af92fe5  
    6666    <bridgehead renderas="sect4">Recommended</bridgehead>
    6767    <para role="recommended">
    68     <xref linkend="qt"/> and
     68    <xref linkend="qt4"/> and
    6969    <xref linkend="dbus"/>
    7070    </para>
  • kde/core/akonadi.xml

    r88647e80 r7af92fe5  
    9999cd build &amp;&amp;
    100100cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    101       -DCMAKE_PREFIX_PATH=&qt-dir; \
     101      -DCMAKE_PREFIX_PATH=&qt4-dir; \
    102102      -DCMAKE_BUILD_TYPE=Release \
    103103      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
     
    116116    <title>Command Explanations</title>
    117117
    118     <para><option>-DCMAKE_PREFIX_PATH=&qt-dir;</option>: This switch is used to
     118    <para><option>-DCMAKE_PREFIX_PATH=&qt4-dir;</option>: This switch is used to
    119119    help <command>cmake</command> find <command>automoc4</command>.</para>
    120120
  • kde/core/attica.xml

    r88647e80 r7af92fe5  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt"/> and
     73    <xref linkend="qt4"/> and
    7474    <xref linkend="cmake"/>
    7575    </para>
  • kde/core/automoc4.xml

    r88647e80 r7af92fe5  
    7373    <para role="required">
    7474    <xref linkend="cmake"/> and
    75     <xref linkend="qt"/>
     75    <xref linkend="qt4"/>
    7676    </para>
    7777
     
    8989<screen><userinput>mkdir build &amp;&amp;
    9090cd build &amp;&amp;
    91 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; .. &amp;&amp;
     91cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; .. &amp;&amp;
    9292make</userinput></screen>
    9393
  • kde/core/config.xml

    r88647e80 r7af92fe5  
    6767    <title>Installing further KDE packages</title>
    6868    <para>Every subsequent package can be built while having <application>KDE</application> up and
    69     running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt-dir;</envar> set.</para>
     69    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
    7070  </sect2>
    7171
  • kde/core/phonon.xml

    r88647e80 r7af92fe5  
    9090    <title>Installation of Phonon</title>
    9191
    92     <para>Make sure that <xref linkend="qt"/> is compiled without the bundled
     92    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
    9393    <application>Phonon</application> library. This package provides
    9494    a better implementation.</para>
     
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     101cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    102102      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
    103103      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
  • kde/core/polkit-qt.xml

    r88647e80 r7af92fe5  
    8787<screen><userinput>mkdir build &amp;&amp;
    8888cd build &amp;&amp;
    89 CMAKE_PREFIX_PATH=&qt-dir; \
     89CMAKE_PREFIX_PATH=&qt4-dir; \
    9090      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9191make</userinput></screen>
     
    104104    <title>Command Explanations</title>
    105105
    106     <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to
     106    <para><option>CMAKE_PREFIX_PATH=&qt4-dir;</option>: This option is set to
    107107    find <command>automoc4</command>.</para>
    108108
  • kde/core/qimageblitz.xml

    r88647e80 r7af92fe5  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt"/> and
     73    <xref linkend="qt4"/> and
    7474    <xref linkend="cmake"/>
    7575    </para>
  • multimedia/videoutils/vlc.xml

    r88647e80 r7af92fe5  
    102102      <xref linkend="libgcrypt"/>,
    103103      <xref linkend="libmad"/> and
    104       <xref linkend="qt"/> (<application>Qt</application> is required for the
     104      <xref linkend="qt4"/> (<application>Qt</application> is required for the
    105105      graphical user interface; without <application>Qt</application> you will
    106106      only be able to use the command line or <application>ncurses</application>
  • networking/netprogs/wpa_supplicant.xml

    r88647e80 r7af92fe5  
    8989      <xref linkend="dbus"/>,
    9090      <xref linkend="libxml2"/> and
    91       <xref linkend="qt"/>
     91      <xref linkend="qt4"/>
    9292    </para>
    9393
     
    190190
    191191    <para>
    192       If you have installed <xref linkend="qt"/> and wish to build
     192      If you have installed <xref linkend="qt4"/> and wish to build
    193193      the <application>WPA Supplicant</application> GUI program, run
    194194      the following commands:
  • networking/netutils/avahi.xml

    r88647e80 r7af92fe5  
    9191    <bridgehead renderas="sect4">Optional</bridgehead>
    9292    <para role="optional">
    93       <xref linkend="qt"/>
     93      <xref linkend="qt4"/>
    9494    </para>
    9595
  • server/other/soprano.xml

    r88647e80 r7af92fe5  
    7979      <xref linkend="dbus"/>,
    8080      <xref linkend="cmake"/>,
    81       <xref linkend="qt"/> and
     81      <xref linkend="qt4"/> and
    8282      <xref linkend="redland"/>
    8383    </para>
  • x/lib/cairo.xml

    r88647e80 r7af92fe5  
    106106      <xref linkend="libdrm"/>,
    107107      <xref linkend="mesalib"/>,
    108       <xref linkend="qt"/>,
     108      <xref linkend="qt4"/>,
    109109      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
    110110      <ulink url="http://www.valgrind.org">Valgrind</ulink>
  • x/lib/lib.xml

    r88647e80 r7af92fe5  
    5050  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
    5151  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
    52   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
     52  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
  • xsoft/other/gnash.xml

    r88647e80 r7af92fe5  
    104104      <xref linkend="libogg"/>,
    105105      <xref linkend="libvorbis"/>,
    106       <xref linkend="qt"/>,
     106      <xref linkend="qt4"/>,
    107107      <xref linkend="speex"/>,
    108108      <xref linkend="wget"/>,
  • xsoft/other/transmission.xml

    r88647e80 r7af92fe5  
    8787    <para role="recommended">
    8888      <xref linkend="gtk3"/> or
    89       <xref linkend="qt"/>
     89      <xref linkend="qt4"/>
    9090    </para>
    9191
     
    112112
    113113    <para>
    114       If you have installed <xref linkend="qt"/> and would like to compile the
     114      If you have installed <xref linkend="qt4"/> and would like to compile the
    115115      Qt GUI, run the following commands:
    116116    </para>
Note: See TracChangeset for help on using the changeset viewer.