diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-11 08:29:11 +0200 |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-11 08:29:11 +0200 |
| commit | 0989cbe2b164560eef14334a540fcbcb2e2ec8cb (patch) | |
| tree | 744ab25eefae406f16da42863b301ea1cbe24473 | |
| parent | 2e41f3fd234a31a57c111b16e0339dea52d77d4d (diff) | |
Remove var->QMAKE_COMP_var docs, and mark feature unsupported.
Reviewed By: andy
| -rw-r--r-- | doc/src/qmake-manual.qdoc | 4 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc index 172bc60e0b..9714a4403a 100644 --- a/doc/src/qmake-manual.qdoc +++ b/doc/src/qmake-manual.qdoc @@ -3303,10 +3303,6 @@ \o output_function \o Specifies a custom qmake function that is used to specify the filename to be created. \row - \o variables - \o Indicates that the variables specified here are replaced with $(QMAKE_COMP_VARNAME) when refered to - in the pro file as $(VARNAME). - \row \o variable_out \o The variable that the files created from the output should be added to. \endtable diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 2d4658e261..a385748f67 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1910,6 +1910,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t) deps += replaceExtraCompilerVariables(pre_deps.at(i), (*input), out); } QString cmd = replaceExtraCompilerVariables(tmp_cmd, (*input), out); + // NOTE: The var -> QMAKE_COMP_var replace feature is unsupported, do not use! for(QStringList::ConstIterator it3 = vars.constBegin(); it3 != vars.constEnd(); ++it3) cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")"); if(!tmp_dep_cmd.isEmpty() && doDepends()) { |