aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seiderer <ps.report@gmx.net>2013-12-10 20:37:59 +0100
committerPeter Seiderer <ps.report@gmx.net>2013-12-12 21:22:55 +0100
commitdbef166874f78f11ce5e77cb65e4562be1866b28 (patch)
tree78a82e846008391c15700c061baad584dac4c0c0
parenta280057efff9366d3258590e0d8796c4d992017d (diff)
Fix release/debug build detection.
Change release/debug build detection from linker setting GenerateDebugInformation to compiler RuntimeLibrary setting (debug in case of rtMultiThreadedDebug or rtMultiThreadedDebugDLL, release otherwise). Task-number: QTVSADDINBUG-350 Change-Id: If698648f0a2511b0d32a2a123947fb476af518a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
-rw-r--r--Qt4VS2003/QtProjectLib/QtProject.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Qt4VS2003/QtProjectLib/QtProject.cs b/Qt4VS2003/QtProjectLib/QtProject.cs
index b2353e22..6baee445 100644
--- a/Qt4VS2003/QtProjectLib/QtProject.cs
+++ b/Qt4VS2003/QtProjectLib/QtProject.cs
@@ -876,8 +876,9 @@ namespace Digia.Qt5ProjectLib
private static bool IsDebugConfiguration(VCConfiguration conf)
{
- VCLinkerTool linker = (VCLinkerTool)((IVCCollection)conf.Tools).Item("VCLinkerTool");
- if (linker != null && linker.GenerateDebugInformation == true)
+ VCCLCompilerTool compiler = (VCCLCompilerTool)((IVCCollection)conf.Tools).Item("VCCLCompilerTool");
+ if (compiler != null && (compiler.RuntimeLibrary == runtimeLibraryOption.rtMultiThreadedDebug ||
+ compiler.RuntimeLibrary == runtimeLibraryOption.rtMultiThreadedDebugDLL))
return true;
return false;
}