Changeset c65ac49d for x/lib/qt5-systemd.xml

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

File:

• x/lib/qt5-systemd.xml (modified) (7 diffs)

x/lib/qt5-systemd.xml

@@ -98 +98 @@
       <xref linkend="gst-plugins-base"/>,
       <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/> (required for QtWebKit),
+      <xref linkend="icu"/> (unicode support, also required for QtWebKit),
       <xref linkend="libjpeg"/>,
       <xref linkend="libmng"/>,
@@ -106 +106 @@
       <xref linkend="openssl"/>,
       <xref linkend="pcre"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="ruby"/> (required for QtWebKit)
+      <xref linkend="ruby"/> (required for QtWebKit), and
+      <xref linkend="sqlite"/>
     </para>
 
@@ -134 +134 @@
   </sect2>
 
-  <sect2 role="qtprefix">
+  <sect2 role="qt5-prefix">
     <title>Setting the installation prefix</title>
 
@@ -154 +154 @@
       <filename class="directory">/usr</filename> hierarchy. This is
       the method that most distributions use. The disadvantage for BLFS
-      users is that this <application>Qt</application> instance cannot
+      users is that this <application>Qt5</application> instance cannot
       be upgraded while it is in use. It also does not allow reverting
       to an existing, known working instance of
@@ -185 +185 @@
   </sect2>
 
-  <sect2 role="multi-install">
+  <sect2 role="qt5-multi-install">
     <title>Dealing with multiple Qt versions</title>
 
@@ -313 +313 @@
     </para>
 
-<screen role="root"><userinput>install -v -dm755 /usr/share/pixmaps &amp;&amp;
-
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
+<screen role="root"><userinput>install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
                   /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
 
@@ -521 +519 @@
       <note>
         <para>
-          If you also have <application>Qt4</application> installed,
+          If <xref linkend="qtchooser"/> is not installed and you
+          also have <application>Qt4</application> installed,
           you will need to manually adjust the <envar>PATH</envar>
           variable depending on which <application>Qt</application>