summaryrefslogtreecommitdiffstats
path: root/doc/html/qmake-manual-6.html
diff options
context:
space:
mode:
Diffstat (limited to 'doc/html/qmake-manual-6.html')
-rw-r--r--doc/html/qmake-manual-6.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/html/qmake-manual-6.html b/doc/html/qmake-manual-6.html
index d91ff29d..8e4fdfee 100644
--- a/doc/html/qmake-manual-6.html
+++ b/doc/html/qmake-manual-6.html
@@ -135,17 +135,17 @@ body { background: #ffffff; color: black; }
<pre>
MY_DEFINES = $${DEFINES}
</pre>
-<p>The second notation allows you to adjoin the variable expansion to another value without separating by space. <em>qmake</em> will allow a variable to contain anything (including $(VALUE), which will be placed directly into the Makefile, and allow it to expand as appropriate, usually an environment variable). However, if you retquire an environment variable to be replaced immediately then you may use the $$() notation. For example:</p>
+<p>The second notation allows you to adjoin the variable expansion to another value without separating by space. <em>qmake</em> will allow a variable to contain anything (including $(VALUE), which will be placed directly into the Makefile, and allow it to expand as appropriate, usually an environment variable). However, if you require an environment variable to be replaced immediately then you may use the $$() notation. For example:</p>
<pre>
MY_DEFINES = $$(ENV_DEFINES)
</pre>
<p>This will set MY_DEFINES to the value of the evironment variable ENV_DEFINES as it parses the .pro file. Additionally you may call built-in functions in variable replacing. These functions (not to be confused with Test Functions as enumerated in the next section) are listed below:</p>
<h4><a name="4-1"></a>join( variablename, glue, before, after )</h4>
-<p>This will join the value of <em>variablename</em> with glue. If this value is non-empty it will prefix the value with <em>before</em> and suffix it with <em>after</em>. <em>variablename</em> is the only retquired field, the others will default to empty strings. If you need to encode spaces in <em>glue</em>, <em>before</em>, or <em>after</em> you must quote them.</p>
+<p>This will join the value of <em>variablename</em> with glue. If this value is non-empty it will prefix the value with <em>before</em> and suffix it with <em>after</em>. <em>variablename</em> is the only required field, the others will default to empty strings. If you need to encode spaces in <em>glue</em>, <em>before</em>, or <em>after</em> you must quote them.</p>
<h4><a name="4-2"></a>prompt( question )</h4>
<p>This will display <em>question</em>, and read from stdin as a return value.</p>
<h4><a name="4-3"></a>member( variablename, position )</h4>
-<p>This will place the value in <em>variablename</em> in position <em>position</em> of the list. If the value of <em>variablename</em> is not long this will return an empty string. <em>variablename</em> is the only retquired field, if not specified position will default to the first value in the list (0).</p>
+<p>This will place the value in <em>variablename</em> in position <em>position</em> of the list. If the value of <em>variablename</em> is not long this will return an empty string. <em>variablename</em> is the only required field, if not specified position will default to the first value in the list (0).</p>
<h4><a name="4-4"></a>find( variablename, substr )</h4>
<p>This will place all the values in <em>variablename</em> that match <em>substr</em>. <em>substr</em> may be a regular expression as well, and will be matched accordingly.</p>
<pre>