From f63f18b840f6b69d5b8677625f3e53c6e6626e5a Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 19 May 2009 15:22:48 +0200
Subject: [PATCH] debugger: put gdb related stuff into directory of its own
---
src/plugins/debugger/debugger.pro | 9 ++-------
src/plugins/debugger/debugger.qrc | 1 -
src/plugins/debugger/debuggerplugin.cpp | 1 -
src/plugins/debugger/gdb/gdb.qrc | 5 +++++
src/plugins/debugger/{ => gdb}/gdbengine.cpp | 2 +-
src/plugins/debugger/{ => gdb}/gdbengine.h | 0
src/plugins/debugger/{ => gdb}/gdbmacros.txt | 0
src/plugins/debugger/{ => gdb}/gdbmi.cpp | 0
src/plugins/debugger/{ => gdb}/gdbmi.h | 0
src/plugins/debugger/{ => gdb}/gdboptionspage.cpp | 0
src/plugins/debugger/{ => gdb}/gdboptionspage.h | 0
src/plugins/debugger/{ => gdb}/gdboptionspage.ui | 0
12 files changed, 8 insertions(+), 10 deletions(-)
create mode 100644 src/plugins/debugger/gdb/gdb.qrc
rename src/plugins/debugger/{ => gdb}/gdbengine.cpp (99%)
rename src/plugins/debugger/{ => gdb}/gdbengine.h (100%)
rename src/plugins/debugger/{ => gdb}/gdbmacros.txt (100%)
rename src/plugins/debugger/{ => gdb}/gdbmi.cpp (100%)
rename src/plugins/debugger/{ => gdb}/gdbmi.h (100%)
rename src/plugins/debugger/{ => gdb}/gdboptionspage.cpp (100%)
rename src/plugins/debugger/{ => gdb}/gdboptionspage.h (100%)
rename src/plugins/debugger/{ => gdb}/gdboptionspage.ui (100%)
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index f708ba1b42e..b964b828425 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -27,8 +27,6 @@ HEADERS += \
disassemblerhandler.h \
disassemblerwindow.h \
watchutils.h \
- gdbengine.h \
- gdbmi.h \
idebuggerengine.h \
imports.h \
moduleshandler.h \
@@ -45,7 +43,6 @@ HEADERS += \
threadswindow.h \
watchhandler.h \
watchwindow.h \
- gdboptionspage.h
SOURCES += \
breakhandler.cpp \
@@ -60,8 +57,6 @@ SOURCES += \
disassemblerhandler.cpp \
disassemblerwindow.cpp \
watchutils.cpp \
- gdbengine.cpp \
- gdbmi.cpp \
moduleshandler.cpp \
moduleswindow.cpp \
outputcollector.cpp \
@@ -76,7 +71,6 @@ SOURCES += \
tcfengine.cpp \
watchhandler.cpp \
watchwindow.cpp \
- gdboptionspage.cpp
FORMS += attachexternaldialog.ui \
attachcoredialog.ui \
@@ -84,7 +78,6 @@ FORMS += attachexternaldialog.ui \
breakbyfunction.ui \
breakcondition.ui \
dumperoptionpage.ui \
- gdboptionspage.ui \
commonoptionspage.ui \
startexternaldialog.ui \
startremotedialog.ui \
@@ -97,6 +90,8 @@ HEADERS += $$PWD/modeltest.h
DEFINES += USE_MODEL_TEST=1
}
+include(gdb/gdb.pri)
+
win32 {
include(win/win.pri)
include(cdb/cdb.pri)
diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index 608626d9700..c00d8b24e15 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/gdbdebugger" >
- <file>gdbmacros.txt</file>
<file>images/breakpoint.svg</file>
<file>images/breakpoint_pending.svg</file>
<file>images/breakpoint_disabled.svg</file>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 2d853d73270..0646db016a5 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -34,7 +34,6 @@
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "debuggerrunner.h"
-#include "gdbengine.h"
#include "ui_commonoptionspage.h"
#include "ui_dumperoptionpage.h"
diff --git a/src/plugins/debugger/gdb/gdb.qrc b/src/plugins/debugger/gdb/gdb.qrc
new file mode 100644
index 00000000000..15579e95ab7
--- /dev/null
+++ b/src/plugins/debugger/gdb/gdb.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/gdb" >
+ <file>gdbmacros.txt</file>
+ </qresource>
+</RCC>
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
similarity index 99%
rename from src/plugins/debugger/gdbengine.cpp
rename to src/plugins/debugger/gdb/gdbengine.cpp
index d232537d4a9..29307601490 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3877,7 +3877,7 @@ void GdbEngine::tryLoadDebuggingHelpers()
return;
if (!startModeAllowsDumpers()) {
// load gdb macro based dumpers at least
- QFile file(_(":/gdbdebugger/gdbmacros.txt"));
+ QFile file(_(":/gdb/gdbmacros.txt"));
file.open(QIODevice::ReadOnly);
QByteArray contents = file.readAll();
//qDebug() << "CONTENTS: " << contents;
diff --git a/src/plugins/debugger/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
similarity index 100%
rename from src/plugins/debugger/gdbengine.h
rename to src/plugins/debugger/gdb/gdbengine.h
diff --git a/src/plugins/debugger/gdbmacros.txt b/src/plugins/debugger/gdb/gdbmacros.txt
similarity index 100%
rename from src/plugins/debugger/gdbmacros.txt
rename to src/plugins/debugger/gdb/gdbmacros.txt
diff --git a/src/plugins/debugger/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp
similarity index 100%
rename from src/plugins/debugger/gdbmi.cpp
rename to src/plugins/debugger/gdb/gdbmi.cpp
diff --git a/src/plugins/debugger/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h
similarity index 100%
rename from src/plugins/debugger/gdbmi.h
rename to src/plugins/debugger/gdb/gdbmi.h
diff --git a/src/plugins/debugger/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
similarity index 100%
rename from src/plugins/debugger/gdboptionspage.cpp
rename to src/plugins/debugger/gdb/gdboptionspage.cpp
diff --git a/src/plugins/debugger/gdboptionspage.h b/src/plugins/debugger/gdb/gdboptionspage.h
similarity index 100%
rename from src/plugins/debugger/gdboptionspage.h
rename to src/plugins/debugger/gdb/gdboptionspage.h
diff --git a/src/plugins/debugger/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
similarity index 100%
rename from src/plugins/debugger/gdboptionspage.ui
rename to src/plugins/debugger/gdb/gdboptionspage.ui
--
GitLab