From d9bc54ed75e14ba19ec00387bb24f78580904d01 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <qtc-committer@nokia.com>
Date: Fri, 20 Feb 2009 15:40:51 +0100
Subject: [PATCH] Moved CDB support into separate directory and enable via
config switch
---
src/plugins/debugger/cdb/cdb.pri | 33 +++++++++++++++++++
.../debugger/{ => cdb}/cdbdebugengine.cpp | 0
.../debugger/{ => cdb}/cdbdebugengine.h | 0
.../{ => cdb}/cdbdebugeventcallback.cpp | 0
.../{ => cdb}/cdbdebugeventcallback.h | 0
.../debugger/{ => cdb}/cdbdebugoutput.cpp | 0
.../debugger/{ => cdb}/cdbdebugoutput.h | 0
src/plugins/debugger/debugger.pro | 30 +----------------
8 files changed, 34 insertions(+), 29 deletions(-)
create mode 100644 src/plugins/debugger/cdb/cdb.pri
rename src/plugins/debugger/{ => cdb}/cdbdebugengine.cpp (100%)
rename src/plugins/debugger/{ => cdb}/cdbdebugengine.h (100%)
rename src/plugins/debugger/{ => cdb}/cdbdebugeventcallback.cpp (100%)
rename src/plugins/debugger/{ => cdb}/cdbdebugeventcallback.h (100%)
rename src/plugins/debugger/{ => cdb}/cdbdebugoutput.cpp (100%)
rename src/plugins/debugger/{ => cdb}/cdbdebugoutput.h (100%)
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
new file mode 100644
index 00000000000..31b6313aa1b
--- /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
similarity index 100%
rename from src/plugins/debugger/cdbdebugengine.cpp
rename to src/plugins/debugger/cdb/cdbdebugengine.cpp
diff --git a/src/plugins/debugger/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h
similarity index 100%
rename from src/plugins/debugger/cdbdebugengine.h
rename to src/plugins/debugger/cdb/cdbdebugengine.h
diff --git a/src/plugins/debugger/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
similarity index 100%
rename from src/plugins/debugger/cdbdebugeventcallback.cpp
rename to src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
diff --git a/src/plugins/debugger/cdbdebugeventcallback.h b/src/plugins/debugger/cdb/cdbdebugeventcallback.h
similarity index 100%
rename from src/plugins/debugger/cdbdebugeventcallback.h
rename to src/plugins/debugger/cdb/cdbdebugeventcallback.h
diff --git a/src/plugins/debugger/cdbdebugoutput.cpp b/src/plugins/debugger/cdb/cdbdebugoutput.cpp
similarity index 100%
rename from src/plugins/debugger/cdbdebugoutput.cpp
rename to src/plugins/debugger/cdb/cdbdebugoutput.cpp
diff --git a/src/plugins/debugger/cdbdebugoutput.h b/src/plugins/debugger/cdb/cdbdebugoutput.h
similarity index 100%
rename from src/plugins/debugger/cdbdebugoutput.h
rename to src/plugins/debugger/cdb/cdbdebugoutput.h
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index fe5a0ce428d..f17533ee5d3 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)
--
GitLab