summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-04-05 15:29:49 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-04-06 14:49:35 +0000
commit2050e32b5f232317593f68916b31ced64e79183d (patch)
treefe866894e43a4f6c7a484c7df2c85b9d79905e9a
parent181e861625e9e7f4d617551aa1d4cec4a5bcd05c (diff)
Fix abuse of assignment-in-conditional (and the resulting warning)
Change-Id: I2025e3360151c76982c45764cbee332855409dd0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 6206b2c8f1..1d4f722e51 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1318,8 +1318,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"))) {