Remove references to qt4 from obconf-qt, qscintilla, qtermwidget,

gst10-plugins-base, v4l-utils, wpa_supplicant, wireshark,
and transmission.


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

introduction/welcome/changelog.xml

@@ -48,7 +48,9 @@
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Remove references to qt4 in poppler, cmake, 
-          doxygen, qca, and pinentry.</para>
+          doxygen, qca, pinentry, obconf-qt, qscintilla, qtermwidget,
+          gst10-plugins-base, v4l-utils, wpa_supplicant, wireshark,
+          and transmission.</para>
         </listitem>
         <listitem>
           <para>[dj] - Add local user and Linux-PAM configuration to vsftpd.

kde/libdbusmenuqt.xml

@@ -30,10 +30,7 @@
     <title>Introduction to libdbusmenu-qt</title>
 
     <para>This library provides a <application>Qt</application> implementation
-    of the DBusMenu specification that exposes menus via DBus.<!--  Its
+    of the DBusMenu specification that exposes menus via DBus.</para>
-    libraries are used by both KDE4 and KF5, but they must be linked to <xref
-    linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions do
-    not conflict with each other.--> </para>
 
     &lfs79_checked;&gcc6_checked;
 

lxqt/apps/obconf-qt.xml

@@ -33,7 +33,7 @@
       The <application>obconf-qt</application> package is an
       <application>OpenBox</application> Qt based configuration tool.</para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -81,9 +81,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="cmake"/>,
-      <xref linkend="openbox"/> and
+      <xref linkend="openbox"/>, and
-      <xref linkend="qt5"/> or
+      <xref linkend="qt5"/> 
-      <xref linkend="qt4"/>
     </para>
 
     <para condition="html" role="usernotes">
@@ -107,7 +106,6 @@ cd       build &amp;&amp;
 cmake -DCMAKE_BUILD_TYPE=Release  \
       -DCMAKE_INSTALL_PREFIX=/usr \
       ..       &amp;&amp;
-
 make</userinput></screen>
 
     <para>

lxqt/apps/qscintilla.xml

@@ -41,7 +41,7 @@
       views and, of course, printing.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
 
@@ -83,8 +83,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="chrpath"/> and
-      <xref linkend="qt5"/> (recommended) or
+      <xref linkend="qt5"/>
-      <xref linkend="qt4"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -103,12 +102,6 @@
   <sect2 role="installation">
     <title>Installation of QScintilla</title>
 
-    <para>
-      If <application>Qt4</application> and <application>Qt5</application> are
-      installed, choose which one you prefer, by running <command>source
-      setqt4</command> or <command>source setqt5</command>, respectivelly.
-    </para>
-
     <note>
       <para>
         The instructions in this page are just for the
@@ -149,12 +142,6 @@ ln -sfv libqscintilla2.so.12.0.1 $QT5DIR/lib/libqt5scintilla2.so.12</userinput><
 install -v -m644    ../doc/html-Qt4Qt5/* \
                     $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
 
-    <para>
-       When building with
-       <application>Qt4</application>, replace <envar>QT5DIR</envar> with
-       <envar>QT4DIR</envar>.
-    </para>
-
   </sect2>
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -179,12 +166,10 @@ install -v -m644    ../doc/html-Qt4Qt5/* \
           None
         </seg>
         <seg>
-          $QT5DIR/lib/libqt5scintilla2.so or $QT4DIR/lib/libqtscintilla2.so
+          $QT5DIR/lib/libqt5scintilla2.so 
         </seg>
         <seg>
           $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
-          or
-          $QT4DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
         </seg>
       </seglistitem>
     </segmentedlist>

lxqt/apps/qtermwidget.xml

@@ -34,7 +34,7 @@
       terminal widget for <application>Qt</application>.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -74,9 +74,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cmake"/> and
+      <xref linkend="cmake"/>, and
-      <xref linkend="qt5"/> or
+      <xref linkend="qt5"/>
-      <xref linkend="qt4"/>
 
     </para>
 
@@ -89,15 +88,8 @@
     <title>Installation of qtermwidget</title>
 
     <para>
-      If you have <application>Qt4</application> and
+      Install <application>qtermwidget</application> by running the 
-      <application>Qt5</application> installed, run <command>source
+      following commands:
-      setqt4</command> or <command>source setqt5</command>, respectively, in
-      order to link <application>qtermwidget</application> to the one of your
-      choice. Following instructions are for <application>Qt5</application>
-      linking. For compilation with <application>Qt4</application>, see
-      <quote>Command Explanations</quote>, below. Install
-      <application>qtermwidget</application> by running the following
-      commands:
     </para>
 
 <screen><userinput>mkdir -v build &amp;&amp;
@@ -136,15 +128,12 @@ make</userinput></screen>
     <para>
       <parameter>-DBUILD_DESIGNER_PLUGIN=0</parameter>: This switch is
       necessary, because building the Qt designer plugin is not supported for
-      <application>Qt5</application> yet. Toggle to 1 or remove, if you prefer
+      <application>Qt5</application> yet. 
-      to use <application>Qt4</application>.
     </para>
 
     <para>
       <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
-      build this application linked to <application>Qt5</application>. Toggle
+      build this application linked to <application>Qt5</application>. 
-      to <quote>false</quote>, if you prefer to use
-      <application>Qt4</application>.
     </para>
 
   </sect2>
@@ -162,13 +151,10 @@ make</userinput></screen>
           None
         </seg>
         <seg>
-          libqtermwidget5.so or
+          libqtermwidget5.so 
-          libqtermwidget4.so and
-          /usr/lib/qt4/plugins/designer/libqtermwidget4plugin.so
         </seg>
         <seg>
-          /usr/{include,share{/cmake,}}/qtermwidget5 or
+          /usr/{include,share{/cmake,}}/qtermwidget5 
-          /usr/{include,share{/cmake,}}/qtermwidget4
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -189,19 +175,7 @@ make</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
-      <varlistentry id="libqtermwidget4-lib">
-        <term><filename class="libraryfile">libqtermwidget4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libqtermwidget4</application> API functions.
-          </para>
-          <indexterm zone="qtermwidget libqtermwidget4-lib">
-            <primary sortas="c-libqtermwidget4">libqtermwidget4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libqtermwidget4plugin-lib">
         <term><filename class="libraryfile">libqtermwidget4plugin.so</filename></term>
         <listitem>
@@ -213,7 +187,7 @@ make</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
 
   </sect2>

multimedia/libdriv/gst10-plugins-base.xml

@@ -104,7 +104,7 @@
       <xref linkend="cdparanoia"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="qt4"/>,
+      <xref linkend="qt5"/>,
       <xref linkend="valgrind"/>,
       <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
       <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and

multimedia/libdriv/v4l-utils.xml

@@ -35,7 +35,7 @@
       most webcams (libv4l), and providing tools to test V4L devices.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,7 +83,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="optional">
       <xref linkend="alsa-lib"/> and
-      <xref linkend="qt4"/> or
       <xref linkend="qt5"/>
     </para>
 
@@ -100,16 +99,6 @@
   <sect2 role="installation">
     <title>Installation of v4l-utils</title>
 
-    <para>
-      If both Qt4 and Qt5 are installed, Qt5 will be used. If you choose to
-      build against Qt4, temporarily hide it from
-      <envar>PKG_CONFIG_PATH</envar>, issuing:
-    </para>
-
-<screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
-PKG_CONFIG_PATH="\
-`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
-
     <para>
       Install <application>v4l-utils</application> by running
       the following commands:
@@ -120,14 +109,6 @@ PKG_CONFIG_PATH="\
             --disable-static  &amp;&amp;
 make</userinput></screen>
 
-    <para>
-      Again, if both Qt4 and 5 are installed and you chose to build against Qt4,
-      restore <envar>PKG_CONFIG_PATH</envar>:
-    </para>
-
-<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
-unset SAVEPATH</userinput></screen>
-
     <para>
       This package does not come with a testsuite.
     </para>

networking/netprogs/wpa_supplicant.xml

@@ -40,7 +40,7 @@
       access point.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -88,7 +88,7 @@
     <para role="optional">
       <xref linkend="dbus"/>,
       <xref linkend="libxml2"/>, and
-      <xref linkend="qt4"/>
+      <xref linkend="qt5"/>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -189,11 +189,14 @@ EOF</userinput></screen>
 make BINDIR=/sbin LIBDIR=/lib</userinput></screen>
 
     <para>
-      If you have installed <xref linkend="qt4"/> and wish to build
+      If you have installed <xref linkend="qt5"/> and wish to build
       the <application>WPA Supplicant</application> GUI program, run
       the following commands:
     </para>
 
+    <note><para>The following directory name is labelled qt4, but 
+    is compatible with <xref linkend="qt5"/>.</para></note>
+
 <screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
 qmake wpa_gui.pro &amp;&amp;
 make &amp;&amp;

networking/netutils/wireshark.xml

@@ -43,7 +43,7 @@
       other popular network analyzers.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -122,8 +122,7 @@
     <bridgehead renderas="sect4">Optional (for GUI front-ends)
     </bridgehead>
     <para role="optional">
-      <xref linkend="gtk2"/>, or
+      <xref linkend="gtk2"/>
-      <xref linkend="qt4"/>,
     </para>
 
     <note>
@@ -134,9 +133,7 @@
       </para>
 
       <para>
-        The <application>Qt</application> GUI needs one of <xref linkend=
+        The <application>Qt</application> GUI needs <xref linkend="qt5"/>. 
-        "qt4"/> or <xref linkend="qt5"/>. If both are installed, Qt5
-        is used by default.
       </para>
 
       <para>
@@ -272,8 +269,6 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
 
     <para>
       <option>--with-qt=[yes/no/4/5]</option>: For the Qt GUI. Default is yes.
-      If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the
-      GUI for only one Qt version (either 4 or 5) can be built.
     </para>
 
     <para>

xsoft/other/transmission.xml

@@ -36,7 +36,7 @@
       bandwidth.
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,8 +83,7 @@
 
     <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
     <para role="recommended">
-      <xref linkend="gtk3"/> and either
+      <xref linkend="gtk3"/> and 
-      <xref linkend="qt4"/> or
       <xref linkend="qt5"/>
     </para>
 
@@ -109,15 +108,6 @@
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-    <para>
-       The following commands are used if you have installed Qt and would like
-       to compile the Qt GUI. If <application>Qt4</application> and
-       <application>Qt5</application> are installed in
-       <filename class="directory">/opt</filename>, use
-       <command>source setqt4</command> or <command>source setqt5</command> to
-       choose which one will be used to build the Qt GUI. 
-    </para>
-
     <para>
       Compile the Qt GUI with the following commands:
     </para>