--- /dev/null
+HEADERS += $$PWD/cdbengine.h \
+ cdb/bytearrayinputstream.h \
+ cdb/cdbparsehelpers.h \
+ cdb/cdboptions.h \
+ cdb/cdboptionspage.h
+
+SOURCES += $$PWD/cdbengine.cpp \
+ cdb/bytearrayinputstream.cpp \
+ cdb/cdbparsehelpers.cpp \
+ cdb/cdboptions.cpp \
+ cdb/cdboptionspage.cpp
+
+FORMS += cdb/cdboptionspagewidget.ui
+
+INCLUDEPATH*=$$PWD
+DEPENDPATH*=$$PWD
**
**************************************************************************/
-#include "cdbengine2.h"
+#include "cdbengine.h"
#include "debuggerstartparameters.h"
#include "disassemblerlines.h"
-#include "cdboptions2.h"
-#include "cdboptionspage2.h"
+#include "cdboptions.h"
+#include "cdboptionspage.h"
#include "bytearrayinputstream.h"
#include "breakpoint.h"
#include "breakhandler.h"
**
**************************************************************************/
-#include "cdboptions2.h"
-#include "cdbengine2.h"
+#include "cdboptions.h"
+#include "cdbengine.h"
#ifdef Q_OS_WIN
# include <utils/winutils.h>
**
**************************************************************************/
-#include "cdboptionspage2.h"
-#include "cdboptions2.h"
+#include "cdboptionspage.h"
+#include "cdboptions.h"
#include "debuggerconstants.h"
-#include "cdbengine2.h"
+#include "cdbengine.h"
#ifdef Q_OS_WIN
# include <utils/winutils.h>
#ifndef CDBSETTINGSPAGE_H
#define CDBSETTINGSPAGE_H
-#include "cdboptions2.h"
+#include "cdboptions.h"
#include <coreplugin/dialogs/ioptionspage.h>
-#include "ui_cdboptionspagewidget2.h"
+#include "ui_cdboptionspagewidget.h"
#include <QtGui/QWidget>
#include <QtCore/QPointer>
static bool checkInstallation(const QString &executable, bool is64Bit,
QString *message);
- Ui::CdbOptionsPageWidget2 m_ui;
+ Ui::CdbOptionsPageWidget m_ui;
CdbBreakEventWidget *m_breakEventWidget;
QTimer *m_reportTimer;
};
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Debugger::Internal::CdbOptionsPageWidget2</class>
- <widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget2">
+ <class>Debugger::Internal::CdbOptionsPageWidget</class>
+ <widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget">
<property name="geometry">
<rect>
<x>0</x>
+++ /dev/null
-HEADERS += $$PWD/cdbengine2.h \
- cdb2/bytearrayinputstream.h \
- cdb2/cdbparsehelpers.h \
- cdb2/cdboptions2.h \
- cdb2/cdboptionspage2.h
-
-SOURCES += $$PWD/cdbengine2.cpp \
- cdb2/bytearrayinputstream.cpp \
- cdb2/cdbparsehelpers.cpp \
- cdb2/cdboptions2.cpp \
- cdb2/cdboptionspage2.cpp
-
-FORMS += cdb2/cdboptionspagewidget2.ui
-
-INCLUDEPATH*=$$PWD
-DEPENDPATH*=$$PWD
LIBS *= -lole32 \
-lshell32
}
-include(cdb2/cdb2.pri)
+include(cdb/cdb.pri)
include(gdb/gdb.pri)
include(script/script.pri)
include(pdb/pdb.pri)
#include "debuggerdialogs.h"
#include "debuggerconstants.h"
-#include "cdb2/cdbengine2.h"
+#include "cdb/cdbengine.h"
#include "ui_attachcoredialog.h"
#include "ui_attachexternaldialog.h"