From 38d048fb0fa9a801b7606a20461430c71ba4f3a0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 19 Jan 2011 14:45:25 +0100
Subject: [PATCH] Debugger[CDB]: Fix autodetection of "Debugging Tools".
Always detected true since the existence of the file
was not checked after the last clause.
---
src/libs/libs.pro | 2 +-
src/libs/qtcreatorcdbext/cdb_detect.pri | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index e441020b7fe..719cbe10fef 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -19,5 +19,5 @@ SUBDIRS = \
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
win32 {
include(qtcreatorcdbext/cdb_detect.pri)
- !isEmpty(CDB_PATH):SUBDIRS += qtcreatorcdbext
+ exists($$CDB_PATH):SUBDIRS += qtcreatorcdbext
}
diff --git a/src/libs/qtcreatorcdbext/cdb_detect.pri b/src/libs/qtcreatorcdbext/cdb_detect.pri
index ac25ae2a472..6fbdee5a6c0 100644
--- a/src/libs/qtcreatorcdbext/cdb_detect.pri
+++ b/src/libs/qtcreatorcdbext/cdb_detect.pri
@@ -12,5 +12,6 @@ win32 {
!exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows (x86)/sdk"
!exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows (x64)/sdk"
!exists($$CDB_PATH):CDB_PATH="$$(ProgramW6432)/Debugging Tools For Windows 64-bit/sdk"
+ !exists($$CDB_PATH)::CDB_PATH=""
}
}
--
GitLab