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 @@
     </para>
 </section>
 
+<section id='ref-classes-qmake*'>
+    <title><filename>qmake*.bbclass</filename></title>
+
+    <para>
+        This family of classes consists of the following:
+        <itemizedlist>
+            <listitem><para><emphasis><filename>qmake_base</filename>:</emphasis>
+                Provides base functionality for all versions of
+                <filename>qmake</filename>.</para></listitem>
+            <listitem><para><emphasis><filename>qmake2</filename>:</emphasis>
+                Extends base functionality for <filename>qmake</filename> 2.x as
+                used by Qt 4.x.</para></listitem>
+        </itemizedlist>
+    </para>
+
+    <para>
+        The <filename>qmake*</filename> family of classes support recipes that
+        need to build software that uses Qt's <filename>qmake</filename>
+        build system.
+    </para>
+
+    <para>
+        If you need to set any configuration variables or pass any options to
+        <filename>qmake</filename>, you can add these to the
+        <link linkend='var-EXTRA_QMAKEVARS_PRE'><filename>EXTRA_QMAKEVARS_PRE</filename></link>
+        or
+        <link linkend='var-EXTRA_QMAKEVARS_POST'><filename>EXTRA_QMAKEVARS_POST</filename></link>
+        variables, depending on whether the arguments need to be before or
+        after the <filename>.pro</filename> file list on the command line,
+        respectively.
+    </para>
+
+    <para>
+        By default, all <filename>.pro</filename> files are built.
+        If you want to specify your own subset of <filename>.pro</filename>
+        files to be built, specify them in the
+        <link linkend='var-QMAKE_PROFILES'><filename>QMAKE_PROFILES</filename></link>
+        variable.
+    </para>
+</section>
+
 <section id='ref-classes-distutils'>
     <title>Python Extensions - <filename>distutils.bbclass</filename></title>
 
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 @@
 <!--               <link linkend='var-glossary-n'>N</link> -->
        <link linkend='var-OE_BINCONFIG_EXTRA_MANGLE'>O</link>
        <link linkend='var-P'>P</link>
-<!--               <link linkend='var-glossary-q'>Q</link> -->
+       <link linkend='var-QMAKE_PROFILES'>Q</link>
        <link linkend='var-RCONFLICTS'>R</link>
        <link linkend='var-S'>S</link>
        <link linkend='var-T'>T</link>
@@ -1803,6 +1803,28 @@
             </glossdef>
         </glossentry>
 
+        <glossentry id='var-EXTRA_QMAKEVARS_POST'><glossterm>EXTRA_QMAKEVARS_POST</glossterm>
+            <glossdef>
+                <para>
+                    Configuration variables or options you want to pass to
+                    <filename>qmake</filename>.
+                    Use this variable when the arguments need to be after the
+                    <filename>.pro</filename> file list on the command line.
+                </para>
+            </glossdef>
+        </glossentry>
+
+       <glossentry id='var-EXTRA_QMAKEVARS_PRE'><glossterm>EXTRA_QMAKEVARS_PRE</glossterm>
+            <glossdef>
+                <para>
+                    Configuration variables or options you want to pass to
+                    <filename>qmake</filename>.
+                    Use this variable when the arguments need to be before the
+                    <filename>.pro</filename> file list on the command line.
+                </para>
+            </glossdef>
+        </glossentry>
+
         <glossentry id='var-EXTRA_USERS_PARAMS'><glossterm>EXTRA_USERS_PARAMS</glossterm>
             <glossdef>
                 <para>
@@ -4989,8 +5011,26 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
 
     </glossdiv>
 
-<!--            <glossdiv id='var-glossary-q'><title>Q</title>-->
-<!--            </glossdiv>-->
+    <glossdiv id='var-glossary-q'><title>Q</title>
+
+        <glossentry id='var-QMAKE_PROFILES'><glossterm>QMAKE_PROFILES</glossterm>
+            <glossdef>
+                <para>
+                    Specifies your own subset of <filename>.pro</filename>
+                    files to be built for use with
+                    <filename>qmake</filename>.
+                </para>
+
+                <para>
+                    To use the <filename>QMAKE_PROFILES</filename> variable,
+                    set it in a recipe that inherits the
+                    <link linkend='ref-classes-qmake*'><filename>qmake_base</filename></link>
+                    class.
+                </para>
+            </glossdef>
+        </glossentry>
+
+    </glossdiv>
 
     <glossdiv id='var-glossary-r'><title>R</title>