diff options
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/snippets/qmake/qtconfiguration.pro | 2 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/qmake/doc/snippets/qmake/qtconfiguration.pro b/qmake/doc/snippets/qmake/qtconfiguration.pro index 55e13be352..fe3667144e 100644 --- a/qmake/doc/snippets/qmake/qtconfiguration.pro +++ b/qmake/doc/snippets/qmake/qtconfiguration.pro @@ -10,7 +10,7 @@ message(Binary files (executables): $$[QT_INSTALL_BINS]) message(Plugins: $$[QT_INSTALL_PLUGINS]) message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) -message(Settings: $$[QT_INSTALL_SETTINGS]) +message(Settings: $$[QT_INSTALL_CONFIGURATION]) message(Examples: $$[QT_INSTALL_EXAMPLES]) #! [0] diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 958550ce91..01313b405f 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2559,6 +2559,13 @@ See also \l{infile(filename, var, val)}{infile()}. + \section2 getenv(variablename) + + Returns the value of the environment variable \c variablename. + This is mostly equivalent to the \c $$(variablename) syntax. + The \c getenv function, however, supports environment variables with + parentheses in their name. + \section2 join(variablename, glue, before, after) Joins the value of \c variablename with \c glue. If this value is |