Changeset 5006a0a for general/prog

Timestamp:

08/02/2014 01:31:26 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

c1405f2d

Parents:

e9f4805

Message:

Remove setqt hacks from packages.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13793 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general/prog

Files:

• cmake-systemd.xml (moved) (moved from general/prog/cmake.xml ) (2 diffs)
• doxygen.xml (modified) (1 diff)
• prog.xml (modified) (1 diff)

general/prog/cmake-systemd.xml

@@ -99 +99 @@
     <title>Installation of CMake</title>
 
-    <para>
+    <!-- <para>
        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-based GUI.
-    </para>
+    </para> -->
 
     <para>
@@ -153 +153 @@
       <application>Qt</application>-based  GUI for
       <application>CMake</application>.
+    </para>
+
+    <para>
+      <option>--qt-qmake=/usr/bin/qmake-qt5</option>: Use this switch if
+      you have both <application>Qt4</application> and
+      <application>Qt5</application> installed but wish to build the
+      <application>Qt5</application> based GUI (it defaults to
+      <application>Qt4</application> one).
     </para>
 

general/prog/doxygen.xml

@@ -145 +145 @@
       <option>--with-doxywizard</option>: Use this parameter if
       <application>Qt4</application> is installed and you wish to build the
-      GUI front-end. If both <application>Qt4</application> and
-      <application>Qt5</application> are installed, use
-      <command>source setqt4</command>. If <application>Qt4</application> is
-      installed in <filename class="directory">/opt</filename>, issue
-      <command>export QTDIR=$QT4DIR</command>.
+      GUI front-end.
     </para>
 

general/prog/prog.xml

@@ -25 +25 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>