Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ general/genlib/qca.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -35,5 +35,5 @@
     the implementation, using plugins known as Providers.</para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65,5 +65,5 @@
     <xref linkend="cacerts"/>,
     <xref linkend="cmake"/>,
-    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
+    <xref linkend="qt5"/>, and
     <xref linkend="which"/>
     </para>
@@ -95,15 +95,4 @@
 <screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
 
-    <para>This package can be built against <xref linkend="qt4"/> or <xref linkend="qt5"/>.
-    If using qt4, run:</para>
-
-<screen><userinput>QT_DIR=&qt4-dir; &amp;&amp;
-QT4_BUILD=ON</userinput></screen>
-
-    <para>If using qt5, run:</para>
-
-<screen><userinput>QT_DIR=&qt5-dir; &amp;&amp;
-QT4_BUILD=OFF</userinput></screen>
-
     <para>Install <application>Qca</application> by running the following
     commands:</para>
@@ -112,10 +101,8 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$QT_DIR            \
+cmake -DCMAKE_INSTALL_PREFIX=$QT5DIR            \
       -DCMAKE_BUILD_TYPE=Release                \
-      -DQT4_BUILD=$QT4_BUILD                    \
       -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
       ..                                        &amp;&amp;
-unset QT_DIR QT4_BUILD                          &amp;&amp;
 
 make</userinput></screen>
@@ -135,7 +122,4 @@
     used to apply a higher level of compiler optimizations.</para>
 
-    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
-    building with Qt4 even if Qt5 is found.</para>
-
     <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     Install the qca man page in the normal location.</para>
@@ -152,10 +136,10 @@
 
       <seglistitem>
-        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
-        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
+        <seg>mozcerts-qt5 and qcatool-qt5</seg>
+        <seg>libqca-qt5.so</seg>
         <seg>
-          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
-          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
-          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
+          &qt5-dir;/include/Qca-qt5,
+          &qt5-dir;/lib/cmake/Qca-qt5, and
+          &qt5-dir;/lib/qca-qt5
         </seg>
       </seglistitem>
@@ -168,10 +152,10 @@
 
       <varlistentry id="mozcerts">
-        <term><command>mozcerts</command></term>
+        <term><command>mozcerts-qt5</command></term>
         <listitem>
           <para>is a command line tool for converting certdata.txt into
           outfile.pem files.</para>
           <indexterm zone="qca mozcerts">
-            <primary sortas="b-mozcerts">mozcerts</primary>
+            <primary sortas="b-mozcerts">mozcerts-qt5</primary>
           </indexterm>
         </listitem>
@@ -179,10 +163,10 @@
 
       <varlistentry id="qcatool">
-        <term><command>qcatool</command></term>
+        <term><command>qcatool-qt5</command></term>
         <listitem>
           <para>is a command line tool for performing various cryptographic
           operations with Qca.</para>
           <indexterm zone="qca qcatool">
-            <primary sortas="b-qcatool">qcatool</primary>
+            <primary sortas="b-qcatool">qcatool-qt5</primary>
           </indexterm>
         </listitem>
@@ -190,9 +174,9 @@
 
       <varlistentry id="libqca">
-        <term><filename class='libraryfile'>libqca.so</filename></term>
+        <term><filename class='libraryfile'>libqca-qt5.so</filename></term>
         <listitem>
           <para>is the Qt Cryptography Architecture (Qca) library.</para>
           <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca.so</primary>
+            <primary sortas="c-libqca">libqca-qt5.so</primary>
           </indexterm>
         </listitem>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ general/genutils/pinentry.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -42,5 +42,5 @@
     toolkits.</para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,6 +80,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="libcap-pam"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="qt4"/>, and
+      <xref linkend="libsecret"/>, and
       <xref linkend="qt5"/>
     </para>
@@ -97,5 +96,4 @@
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-
 make</userinput></screen><!-- &amp;&amp;
 
@@ -132,10 +130,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-pinentry-qt5</option>: Default is enable. Don't use qt5
-      even if it is available. If qt4 is found, <command>pinentry-qt</command>
-      will be linked to qt4.
-    </para>
 
     <para>
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ general/graphlib/poppler.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -144,7 +144,5 @@
       <xref linkend="libtiff"/>,
       <xref linkend="openjpeg2"/>
-      (preference is for OpenJPEG1, due to regressions with OpenJPEG2),
-      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
-      is needed for PDF support in <application>Okular</application>), and
+      (preference is for OpenJPEG1, due to regressions with OpenJPEG2), and
       <xref linkend="qt5"/>
     </para>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ general/prog/cmake.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -85,5 +85,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
+      <xref linkend="qt5"/> (for the Qt-based GUI),
       <xref linkend="subversion"/> (for testing), and
       <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ general/prog/doxygen.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -51,5 +51,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -109,7 +109,6 @@
       <xref linkend="llvm"/> (with clang),
       <xref linkend="python2"/> or <xref linkend="python3"/>,
-      <xref linkend="qt4"/> or
       <xref linkend="qt5"/> (for doxywizard),
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>) and
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
       <xref linkend="xapian"/> (for doxyindexer)
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ introduction/welcome/changelog.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -47,4 +47,8 @@
       <para>June 4th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove references to qt4 in poppler, cmake, 
+          doxygen, qca, and pinentry.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Add local user and Linux-PAM configuration to vsftpd.
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 87f9b81583b780d78a83fd9a3ac656e36090e134)
+++ x/lib/qt4.xml	(revision 67b1a0a10d9ca149c065556cc4710dcc545223f1)
@@ -17,8 +17,8 @@
   <!ENTITY qt4-buildsize     "2.3 GB">
   <!ENTITY qt4-time          "12 SBU, using parallelism=4">
-
+<!--
   <!ENTITY qtwebkit-download "&webkit-url;/&wk-version;/src/qtwebkit-&wk-version;.tar.gz">
   <!ENTITY qtwebkit-md5sum   "42ef76d0cf7d0c611ef83418e9f297ff">
-  <!ENTITY qtwebkit-size     "50 MB">
+  <!ENTITY qtwebkit-size     "50 MB">-->
 ]>
 
@@ -84,5 +84,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -109,5 +109,5 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -295,5 +295,5 @@
             -i $file
 done</userinput></screen>
-
+<!--
     <bridgehead renderas="sect3">Building Qtwebkit</bridgehead>
 
@@ -317,10 +317,10 @@
 
 QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
-Tools/Scripts/build-webkit --qt            \
-                           --no-webkit2    \
-                           --prefix=$QT4PREFIX</userinput></screen>
+Tools/Scripts/build-webkit -i -qt            \
+                           - -no-webkit2    \
+                           - -prefix=$QT4PREFIX</userinput></screen>
 
    <para>If desired, the build process can use parallel processors by
-   adding the option <option>--makeargs=-j&lt;number&gt;</option> to
+   adding the option <option>- -makeargs=-j&lt;number&gt;</option> to
    the <command>build-webkit</command> instruction above.</para>
 
@@ -330,5 +330,5 @@
 
 <screen role="root"><userinput>make -C WebKitBuild/Release install</userinput></screen>
-
+-->
     <bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
 
