Page MenuHomeFreeBSD
Files F137993867

D17430.id48769.diff
No OneTemporary
Actions

D17430.id48769.diff
View Options

Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
@@ -2548,14 +2548,13 @@
<para>The Ports Collection provides support for Qt 4 and Qt 5
frameworks with
- <varname>USE_QT<replaceable>x</replaceable></varname>,
+ <varname>USES+=qt:<replaceable>x</replaceable></varname>,
where <replaceable>x</replaceable> is
<literal>4</literal> or <literal>5</literal>.
- Set <varname>USE_QT<replaceable>x</replaceable></varname>
- to the list of required Qt components (libraries,
- tools, plugins). The Qt 4 and Qt 5 frameworks are quite
- similar. The main difference is the set of supported
- components.</para>
+ Set <varname>USE_QT</varname> to the list of required
+ Qt components (libraries, tools, plugins). The Qt 4
+ and Qt 5 frameworks are quite similar. The main
+ difference is the set of supported components.</para>
<para>The Qt framework exports a number of variables which can
be used by ports, some of them listed below:</para>
@@ -2835,7 +2834,8 @@
only needed at buildtime, thus they are specified with the
<literal>_build</literal> suffix:</para>
- <programlisting>USE_QT4= gui moc_build qmake_build rcc_build uic_build</programlisting>
+ <programlisting>USES= qt:4
+USE_QT= gui moc_build qmake_build rcc_build uic_build</programlisting>
</example>
</sect2>
@@ -2847,10 +2847,9 @@
<application>qmake</application> project file
(<filename>*.pro</filename>), define
<literal>USES= qmake</literal> along with
- <literal>USE_QT<replaceable>x</replaceable></literal>. Note
- that <literal>USES= qmake</literal> already implies a build
- dependency on qmake, therefore the qmake component can be
- omitted from
+ <literal>USE_QT</literal>. <literal>USES= qmake</literal>
+ already implies a build dependency on qmake, therefore the
+ qmake component can be omitted from
<literal>USE_QT<replaceable>x</replaceable></literal>.
Similar to <link
linkend="using-cmake"><application>CMake</application></link>,
@@ -2906,12 +2905,12 @@
<para>This snippet demonstrates the use of
<application>qmake</application> for a Qt 4 port:</para>
- <programlisting>USES= qmake:outsource
-USE_QT4= moc_build</programlisting>
+ <programlisting>USES= qmake:outsource qt:4
+USE_QT= moc_build</programlisting>
<para>For a Qt 5 port:</para>
- <programlisting>USES= qmake:outsource
-USE_QT5= buildtools_build</programlisting>
+ <programlisting>USES= qmake:outsource qt:5
+USE_QT= buildtools_build</programlisting>
</example>
<para>Qt applications are often written to be cross-platform
@@ -3135,13 +3134,13 @@
Required KDE components and other dependencies can be
determined through configure log.
<varname>USE_KDE</varname> does not imply
- <varname>USE_QT4</varname>. If a port requires some
+ <varname>USE_QT</varname>. If a port requires some
Qt 4 components, specify them in
- <varname>USE_QT4</varname>.</para>
+ <varname>USE_QT</varname>.</para>
- <programlisting>USES= cmake:outsource kde:4
+ <programlisting>USES= cmake:outsource kde:4 qt:4
USE_KDE= kdelibs kdeprefix automoc4
-USE_QT4= moc_build qmake_build rcc_build uic_build</programlisting>
+USE_QT= moc_build qmake_build rcc_build uic_build</programlisting>
</example>
</sect2>
</sect1>
@@ -3198,9 +3197,9 @@
LXQt libraries. Required LXQt components and
other dependencies can be determined from the
configure log.</para>
- <programlisting>USES= cmake:outsource lxqt tar:xz
-USE_QT5= buildtools_build qmake_build core dbus widgets
-USE_LXQT= buildtools libfmqt</programlisting>
+ <programlisting>USES= cmake:outsource lxqt qt:5 tar:xz
+USE_QT= core dbus widgets buildtools_build qmake_build
+USE_LXQT= buildtools libfmqt</programlisting>
</example>
</sect1>
Index: en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
@@ -1381,7 +1381,8 @@
<sect1 xml:id="uses-kde">
<title><literal>kde</literal></title>
- <para>Possible arguments: <literal>4</literal></para>
+ <para>Possible arguments: <literal>4</literal>,
+ <literal>5</literal></para>
<para>Add dependency on <application>KDE</application> components.
See <xref linkend="using-kde"/> for more information.</para>
@@ -2662,6 +2663,16 @@
<para>Uses <application>QMake</application> for configuring. For
more information see <xref linkend="using-qmake"/>.</para>
+ </sect1>
+
+ <sect1 xml:id="uses-qt">
+ <title><literal>qt</literal></title>
+
+ <para>Possible arguments: <literal>4</literal>,
+ <literal>5</literal></para>
+
+ <para>Add dependency on <application>Qt</application> components.
+ See <xref linkend="using-qt"/> for more information.</para>
</sect1>
<sect1 xml:id="uses-readline">

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 11:33 PM (13 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26308195
Default Alt Text
D17430.id48769.diff (5 KB)

Event Timeline