diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
| commit | ee0951d69b38f766e67262487be95b88501aa4a5 (patch) | |
| tree | 116c334060500be340d4d61c99026316b0df3ce9 /qmake/generators | |
| parent | 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff) | |
| parent | d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qftp.cpp
src/widgets/itemviews/qheaderview.cpp
src/widgets/itemviews/qlistview.cpp
tests/auto/network/access/qftp/tst_qftp.cpp
Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index c2b285ddc4..a972316972 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1310,8 +1310,8 @@ void VcprojGenerator::initDeploymentTool() + "|0;"; if (!qpaPluginDeployed) { QChar debugInfixChar; - bool foundGuid = false; - if (foundGuid = dllName.contains(QLatin1String("Guid"))) + bool foundGuid = dllName.contains(QLatin1String("Guid")); + if (foundGuid) debugInfixChar = QLatin1Char('d'); if (foundGuid || dllName.contains(QLatin1String("Gui"))) { |