8 files changed, 34 insertions, 29 deletions
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
new file mode 100644
index 0000000000..31b6313aa1
--- /dev/null
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -0,0 +1,33 @@
+win32 {
+# ---- Detect Debugging Tools For Windows
+
+CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
+
+exists ($$CDB_PATH) {
+message("Experimental: Adding support for $$CDB_PATH")
+
+DEFINES+=CDB_ENABLED
+
+CDB_PLATFORM=i386
+
+INCLUDEPATH*=$$CDB_PATH
+INCLUDEPATH*=$$PWD
+
+CDB_LIBPATH=$$CDB_PATH/lib/$$CDB_PLATFORM
+
+HEADERS += \
+    $$PWD/cdbdebugengine.h \
+    $$PWD/cdbdebugeventcallback.h \
+    $$PWD/cdbdebugoutput.h
+
+SOURCES += \
+    $$PWD/cdbdebugengine.cpp \
+    $$PWD/cdbdebugeventcallback.cpp \
+    $$PWD/cdbdebugoutput.cpp
+
+LIBS += -L$$CDB_LIBPATH Dbghelp.lib dbgeng.lib
+
+} else {
+   error("Debugging Tools for Windows could not be found in $$CDB_PATH")
+}
+}
diff --git a/src/plugins/debugger/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index 486ac253cc..486ac253cc 100644
--- a/src/plugins/debugger/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
diff --git a/src/plugins/debugger/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h
index bea545596d..bea545596d 100644
--- a/src/plugins/debugger/cdbdebugengine.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine.h
diff --git a/src/plugins/debugger/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index 893b8d9ab5..893b8d9ab5 100644
--- a/src/plugins/debugger/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
diff --git a/src/plugins/debugger/cdbdebugeventcallback.h b/src/plugins/debugger/cdb/cdbdebugeventcallback.h
index f9fa3e11c3..f9fa3e11c3 100644
--- a/src/plugins/debugger/cdbdebugeventcallback.h
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.h
diff --git a/src/plugins/debugger/cdbdebugoutput.cpp b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
index 94bc33cd25..94bc33cd25 100644
--- a/src/plugins/debugger/cdbdebugoutput.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
diff --git a/src/plugins/debugger/cdbdebugoutput.h b/src/plugins/debugger/cdb/cdbdebugoutput.h
index 273c8afcf1..273c8afcf1 100644
--- a/src/plugins/debugger/cdbdebugoutput.h
+++ b/src/plugins/debugger/cdb/cdbdebugoutput.h
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index fe5a0ce428..f17533ee5d 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -85,32 +85,4 @@ HEADERS += $$PWD/modeltest.h
 DEFINES += USE_MODEL_TEST=1
 }
 
-win32 {
-# ---- Detect Debugging Tools For Windows
-
-CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
-
-exists ($$CDB_PATH) {
-message("Experimental: Adding support for $$CDB_PATH")
-
-DEFINES+=CDB_ENABLED
-
-CDB_PLATFORM=i386
-
-INCLUDEPATH+=$$CDB_PATH
-CDB_LIBPATH=$$CDB_PATH/lib/$$CDB_PLATFORM
-
-HEADERS += \
-    cdbdebugengine.h \
-    cdbdebugeventcallback.h \
-    cdbdebugoutput.h
-
-SOURCES += \
-    cdbdebugengine.cpp \
-    cdbdebugeventcallback.cpp \
-    cdbdebugoutput.cpp
-
-LIBS += -L$$CDB_LIBPATH Dbghelp.lib dbgeng.lib
-
-}
-}
+CONFIG(cdbdebugger):include(cdb\cdb.pri)