diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 08:48:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 09:12:36 +0200 |
| commit | f34e73a16a3d757057e007874cb5008f16e20f02 (patch) | |
| tree | bcc228617cf240773fd09daac1a1a2614b552b68 /qmake/generators/win32/msvc_vcproj.cpp | |
| parent | 5380808453728a354ae28aae76e85ac448245cf1 (diff) | |
| parent | b9d386f2ccd69c7f6a766a6d90a6024eeb48e90a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/gui/painting/qpaintengine_raster.cpp
Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -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 79bac8bafe..ef957b6dbf 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1290,8 +1290,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"))) { |