Page MenuHomeFreeBSD
Files F163238970

D17429.id48777.diff
No OneTemporary
Actions

D17429.id48777.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>
@@ -2566,12 +2565,6 @@
<tgroup cols="2">
<tbody>
<row>
- <entry><varname>QT_PREFIX</varname></entry>
- <entry>Set to the path where Qt was installed
- (<literal>&dollar;{LOCALBASE}</literal>).</entry>
- </row>
-
- <row>
<entry><varname>QMAKE</varname></entry>
<entry>Full path to <command>qmake</command>
binary.</entry>
@@ -2642,8 +2635,7 @@
<title>Component Selection</title>
<para>Individual Qt tool and library dependencies must be
- specified in
- <varname>USE_QT<replaceable>x</replaceable></varname>.
+ specified in <varname>USE_QT</varname>.
Every component can be suffixed with
<literal>_build</literal> or <literal>_run</literal>, the
suffix indicating whether the dependency on the component is
@@ -2835,31 +2827,71 @@
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>
<sect2 xml:id="using-qmake">
<title>Using <command>qmake</command></title>
-
<para>If the application provides a
<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<replaceable>x</replaceable></literal>.
- Similar to <link
+ <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</literal>. Similar to <link
linkend="using-cmake"><application>CMake</application></link>,
<application>qmake</application> supports out-of-source
builds, which can be enabled by specifying the
<literal>outsource</literal> argument (see <link
linkend="using-qmake-example"><literal>USES= qmake</literal>
- example</link>).</para>
+ example</link>). Also see <xref
+ linkend="using-qmake-arguments" />.</para>
+ <table frame="none" xml:id="using-qmake-arguments">
+ <title>Possible Arguments for
+ <literal>USES= qmake</literal></title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Variable</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><literal>no_configure</literal></entry>
+ <entry>Do not add the configure target. This is
+ implied by <literal>HAS_CONFIGURE=yes</literal>
+ and <literal>GNU_CONFIGURE=yes</literal>.</entry>
+ </row>
+
+ <row>
+ <entry><literal>no_env</literal></entry>
+ <entry>Suppress the modification of the configure
+ and make environments.</entry>
+ </row>
+
+ <row>
+ <entry><literal>norecursive</literal></entry>
+ <entry>Do not pass the <literal>-recursive</literal>
+ argument to <command>qmake</command>.</entry>
+ </row>
+
+ <row>
+ <entry><literal>outsource</literal></entry>
+ <entry>Perform an out-of-source build.</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
<table frame="none" xml:id="using-qmake-variables">
<title>Variables for Ports That Use
<command>qmake</command></title>
@@ -2868,7 +2900,7 @@
<thead>
<row>
<entry>Variable</entry>
- <entry>Means</entry>
+ <entry>Description</entry>
</row>
</thead>
@@ -2906,14 +2938,26 @@
<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>
+ <tip>
+ <para>It is possible to set the <application>Qt</application>
+ version as an argument to <literal>USES=qmake</literal>.
+ For example:</para>
+
+ <programlisting>USES= qmake:5,outsource</programlisting>
+
+ <para>This is recommended for ports that use
+ <command>qmake</command> for configuration, but do not
+ list any components via <varname>USE_QT</varname>.</para>
+ </tip>
+
<para>Qt applications are often written to be cross-platform
and often X11/Unix is not the platform they are developed
on, which in turn leads to certain loose ends,
@@ -3135,13 +3179,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 +3242,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>
@@ -2658,10 +2659,21 @@
<title><literal>qmake</literal></title>
<para>Possible arguments: (none), <literal>norecursive</literal>,
- <literal>outsource</literal></para>
+ <literal>outsource</literal>, <literal>no_env</literal>,
+ <literal>no_configure</literal></para>
<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
Wed, Jul 22, 8:11 AM (7 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35355736
Default Alt Text
D17429.id48777.diff (8 KB)

Event Timeline