debugger: put gdb related stuff into directory of its own

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)

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>

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"

src/plugins/debugger/gdb/gdb.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/gdb" >
+        <file>gdbmacros.txt</file>
+    </qresource>
+</RCC>

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;