diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
| commit | 261a87f956f345d4064eb2eb64e0cf7c98ec7d92 (patch) | |
| tree | 53d10a28cdaf526418f4419c99cb26485c047a0d /qmake/generators | |
| parent | 0652bdcf5e60461cd9a513d64be00b8830826fad (diff) | |
| parent | 5f1cf8e0f5da36063202d46463c2d9e79d841a4d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/makefile.cpp
Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d
Diffstat (limited to 'qmake/generators')
| -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 ff936bf1ee..be282d7260 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3429,9 +3429,9 @@ MakefileGenerator::writePkgConfigFile() t << Qt::endl; // requires - const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); - if (!requires.isEmpty()) { - t << "Requires: " << requires << Qt::endl; + const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); + if (!requiresString.isEmpty()) { + t << "Requires: " << requiresString << Qt::endl; } t << Qt::endl; |