Index: archive/setqt.xml
===================================================================
--- archive/setqt.xml	(revision fdbc20109bbe119613f4732dd3b19a92b6b315e5)
+++ archive/setqt.xml	(revision fdbc20109bbe119613f4732dd3b19a92b6b315e5)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../general.ent">
+   %general-entities;
+]>
+
+<!-- $LastChangedBy$
+     $Date$ -->
+
+<sect3>
+    <title>Choosing Qt Program Versions</title>
+
+    <para>If you install both Qt4 and Qt5, you can use some simple
+    scripts to select the currently active set of Qt programs.  As the
+    <systemitem class="username">root</systemitem> user, create
+    the following scripts:</para>
+
+<screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
+<literal>if [ "x$QT5DIR" != "x/usr" ] &amp;&amp; [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
+if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
+echo $PATH</literal>
+EOF</userinput></screen>
+
+<screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
+<literal>if [ "x$QT4DIR" != "x/usr" ] &amp;&amp; [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
+if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
+echo $PATH</literal>
+EOF</userinput></screen>
+
+    <para>You should now be able to use the appropriate Qt version by running
+    <command>source setqt4</command> or <command>source setqt5</command> as
+    desired. (Setting the PATH wont work in a subshell.) Another technique that
+    can be used is to create appropriate alias additions to your ~/.bashrc like
+    <command>alias setqt4='source setqt4'</command>.</para>
+
+</sect3>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision f277301ffc89f34cf578560a88cdf210d126f87c)
+++ general/prog/cmake.xml	(revision fdbc20109bbe119613f4732dd3b19a92b6b315e5)
@@ -123,12 +123,5 @@
       cmake-&cmake-version;-test.log</command>, where
       <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
-      number of system cores. For some systems, it may be necessary to run the
-      tests only for Qt4 using <command>source setq4</command>
-      before the
-      <command>./bootstrap ...</command>) command.  
-      One of the problematic
-      tests relates to the test procedures finding the correct Qt files. One
-      of 444 tests is known to fail under some circumstances related to Gtk+2
-      and c++ standards.
+      number of system cores.  
 
      <!-- Please, don't remove this comment, needed if tests start to fail
Index: ncludes/setqt.xml
===================================================================
--- xincludes/setqt.xml	(revision f277301ffc89f34cf578560a88cdf210d126f87c)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../general.ent">
-   %general-entities;
-]>
-
-<!-- $LastChangedBy$
-     $Date$ -->
-
-<sect3>
-    <title>Choosing Qt Program Versions</title>
-
-    <para>If you install both Qt4 and Qt5, you can use some simple
-    scripts to select the currently active set of Qt programs.  As the
-    <systemitem class="username">root</systemitem> user, create
-    the following scripts:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/setqt4 &lt;&lt; 'EOF'
-<literal>if [ "x$QT5DIR" != "x/usr" ] &amp;&amp; [ "x$QT5DIR" != "x" ]; then pathremove  $QT5DIR/bin; fi
-if [ "x$QT4DIR" != "x/usr" ]; then pathprepend $QT4DIR/bin; fi
-echo $PATH</literal>
-EOF</userinput></screen>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/setqt5 &lt;&lt; 'EOF'
-<literal>if [ "x$QT4DIR" != "x/usr" ] &amp;&amp; [ "x$QT4DIR" != "x" ]; then pathremove  $QT4DIR/bin; fi
-if [ "x$QT5DIR" != "x/usr" ]; then pathprepend $QT5DIR/bin; fi
-echo $PATH</literal>
-EOF</userinput></screen>
-
-    <para>You should now be able to use the appropriate Qt version by running
-    <command>source setqt4</command> or <command>source setqt5</command> as
-    desired. (Setting the PATH wont work in a subshell.) Another technique that
-    can be used is to create appropriate alias additions to your ~/.bashrc like
-    <command>alias setqt4='source setqt4'</command>.</para>
-
-</sect3>
