diff options
| author | Yulong Bai <yulong.bai@qt.io> | 2019-07-18 17:21:23 +0200 |
|---|---|---|
| committer | Yulong Bai <yulong.bai@qt.io> | 2019-07-19 21:31:50 +0200 |
| commit | a96a64be2dc3110d140e43d2cf85454d9fc998b8 (patch) | |
| tree | 036489e5c11d66330e0a426efc2f5d90b6a1ac0f /qmake | |
| parent | 65f9646583d74c97aab7f8ea90197e370d7bfede (diff) | |
qmake: fix variable naming conflicts with C++20 keyword
It conflicts with 'requires' keyword.
Fixes: QTBUG-77093
Change-Id: I85e8f530dd1e2bf9a31906dd6c5123b947235b01
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index bc59eaaea2..11623cd147 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3418,9 +3418,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires - const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); - if (!requires.isEmpty()) { - t << "Requires: " << requires << endl; + const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); + if (!requiresString.isEmpty()) { + t << "Requires: " << requiresString << endl; } t << endl; |