summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/ref-manual/ref-classes.xml41
-rw-r--r--documentation/ref-manual/ref-variables.xml46
2 files changed, 84 insertions, 3 deletions
diff --git a/documentation/ref-manual/ref-classes.xml b/documentation/ref-manual/ref-classes.xml
index d2eb1be68a..634c14fe9b 100644
--- a/documentation/ref-manual/ref-classes.xml
+++ b/documentation/ref-manual/ref-classes.xml
@@ -1596,6 +1596,47 @@
1596 </para> 1596 </para>
1597</section> 1597</section>
1598 1598
1599<section id='ref-classes-qmake*'>
1600 <title><filename>qmake*.bbclass</filename></title>
1601
1602 <para>
1603 This family of classes consists of the following:
1604 <itemizedlist>
1605 <listitem><para><emphasis><filename>qmake_base</filename>:</emphasis>
1606 Provides base functionality for all versions of
1607 <filename>qmake</filename>.</para></listitem>
1608 <listitem><para><emphasis><filename>qmake2</filename>:</emphasis>
1609 Extends base functionality for <filename>qmake</filename> 2.x as
1610 used by Qt 4.x.</para></listitem>
1611 </itemizedlist>
1612 </para>
1613
1614 <para>
1615 The <filename>qmake*</filename> family of classes support recipes that
1616 need to build software that uses Qt's <filename>qmake</filename>
1617 build system.
1618 </para>
1619
1620 <para>
1621 If you need to set any configuration variables or pass any options to
1622 <filename>qmake</filename>, you can add these to the
1623 <link linkend='var-EXTRA_QMAKEVARS_PRE'><filename>EXTRA_QMAKEVARS_PRE</filename></link>
1624 or
1625 <link linkend='var-EXTRA_QMAKEVARS_POST'><filename>EXTRA_QMAKEVARS_POST</filename></link>
1626 variables, depending on whether the arguments need to be before or
1627 after the <filename>.pro</filename> file list on the command line,
1628 respectively.
1629 </para>
1630
1631 <para>
1632 By default, all <filename>.pro</filename> files are built.
1633 If you want to specify your own subset of <filename>.pro</filename>
1634 files to be built, specify them in the
1635 <link linkend='var-QMAKE_PROFILES'><filename>QMAKE_PROFILES</filename></link>
1636 variable.
1637 </para>
1638</section>
1639
1599<section id='ref-classes-distutils'> 1640<section id='ref-classes-distutils'>
1600 <title>Python Extensions - <filename>distutils.bbclass</filename></title> 1641 <title>Python Extensions - <filename>distutils.bbclass</filename></title>
1601 1642
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index c756512c52..44ef461728 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -32,7 +32,7 @@
32<!-- <link linkend='var-glossary-n'>N</link> --> 32<!-- <link linkend='var-glossary-n'>N</link> -->
33 <link linkend='var-OE_BINCONFIG_EXTRA_MANGLE'>O</link> 33 <link linkend='var-OE_BINCONFIG_EXTRA_MANGLE'>O</link>
34 <link linkend='var-P'>P</link> 34 <link linkend='var-P'>P</link>
35<!-- <link linkend='var-glossary-q'>Q</link> --> 35 <link linkend='var-QMAKE_PROFILES'>Q</link>
36 <link linkend='var-RCONFLICTS'>R</link> 36 <link linkend='var-RCONFLICTS'>R</link>
37 <link linkend='var-S'>S</link> 37 <link linkend='var-S'>S</link>
38 <link linkend='var-T'>T</link> 38 <link linkend='var-T'>T</link>
@@ -1803,6 +1803,28 @@
1803 </glossdef> 1803 </glossdef>
1804 </glossentry> 1804 </glossentry>
1805 1805
1806 <glossentry id='var-EXTRA_QMAKEVARS_POST'><glossterm>EXTRA_QMAKEVARS_POST</glossterm>
1807 <glossdef>
1808 <para>
1809 Configuration variables or options you want to pass to
1810 <filename>qmake</filename>.
1811 Use this variable when the arguments need to be after the
1812 <filename>.pro</filename> file list on the command line.
1813 </para>
1814 </glossdef>
1815 </glossentry>
1816
1817 <glossentry id='var-EXTRA_QMAKEVARS_PRE'><glossterm>EXTRA_QMAKEVARS_PRE</glossterm>
1818 <glossdef>
1819 <para>
1820 Configuration variables or options you want to pass to
1821 <filename>qmake</filename>.
1822 Use this variable when the arguments need to be before the
1823 <filename>.pro</filename> file list on the command line.
1824 </para>
1825 </glossdef>
1826 </glossentry>
1827
1806 <glossentry id='var-EXTRA_USERS_PARAMS'><glossterm>EXTRA_USERS_PARAMS</glossterm> 1828 <glossentry id='var-EXTRA_USERS_PARAMS'><glossterm>EXTRA_USERS_PARAMS</glossterm>
1807 <glossdef> 1829 <glossdef>
1808 <para> 1830 <para>
@@ -4989,8 +5011,26 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
4989 5011
4990 </glossdiv> 5012 </glossdiv>
4991 5013
4992<!-- <glossdiv id='var-glossary-q'><title>Q</title>--> 5014 <glossdiv id='var-glossary-q'><title>Q</title>
4993<!-- </glossdiv>--> 5015
5016 <glossentry id='var-QMAKE_PROFILES'><glossterm>QMAKE_PROFILES</glossterm>
5017 <glossdef>
5018 <para>
5019 Specifies your own subset of <filename>.pro</filename>
5020 files to be built for use with
5021 <filename>qmake</filename>.
5022 </para>
5023
5024 <para>
5025 To use the <filename>QMAKE_PROFILES</filename> variable,
5026 set it in a recipe that inherits the
5027 <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link>
5028 class.
5029 </para>
5030 </glossdef>
5031 </glossentry>
5032
5033 </glossdiv>
4994 5034
4995 <glossdiv id='var-glossary-r'><title>R</title> 5035 <glossdiv id='var-glossary-r'><title>R</title>
4996 5036