1 files changed, 10 insertions, 5 deletions
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index 013376911f..b6f7518ae9 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -67,13 +67,18 @@ win32:SUBDIRS += utils/process_ctrlc_stub.pro
 
 # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
 win32: isEmpty(QTC_SKIP_CDBEXT) {
-    include(qtcreatorcdbext/cdb_detect.pri)
-    !isEmpty(CDB_PATH): exists($$CDB_PATH) {
+    CDB_NO_AUTODETECT = $$(CDB_NO_AUTODETECT) #use the debugger header and lib defined in INCLUDE and LIB env var
+    !isEmpty(CDB_NO_AUTODETECT) {
         SUBDIRS += qtcreatorcdbext
     } else {
-        message("Compiling Qt Creator without a CDB extension.")
-        message("If CDB is installed in a none default path define a CDB_PATH")
-        message("environment variable pointing to your CDB installation.")
+        include(qtcreatorcdbext/cdb_detect.pri)
+        !isEmpty(CDB_PATH): exists($$CDB_PATH) {
+            SUBDIRS += qtcreatorcdbext
+        } else {
+            message("Compiling Qt Creator without a CDB extension.")
+            message("If CDB is installed in a none default path define a CDB_PATH")
+            message("environment variable pointing to your CDB installation.")
+        }
     }
 }