feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix compilation on Windows.

Browse Source 
Broken by f77cd29e54.

Change-Id: I3cbb4e90ffae45ca1475b0de1a00cb5ee58f966a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-05-23 13:36:36 +02:00
committed by hjk
parent 7b856ee45e
commit 1a81c33e2f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdboptionspage.cpp
View File

@@ -231,7 +231,8 @@ CdbOptionsPage::CdbOptionsPage() :
CdbOptionsPage::m_instance = this; CdbOptionsPage::m_instance = this;
m_options->fromSettings(Core::ICore::settings()); m_options->fromSettings(Core::ICore::settings());
setId(QLatin1String("F.Cda")); // before old CDB setId(CdbOptionsPage::settingsId());
setDisplayName(tr("CDB")); setDisplayName(tr("CDB"));
setCategory(QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY)); setCategory(QLatin1String(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY));
setDisplayCategory(QCoreApplication::translate("Debugger", setDisplayCategory(QCoreApplication::translate("Debugger",
@@ -239,6 +240,11 @@ CdbOptionsPage::CdbOptionsPage() :
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
QString CdbOptionsPage::settingsId()
{
return QLatin1String("F.Cda");
}
CdbOptionsPage::~CdbOptionsPage() CdbOptionsPage::~CdbOptionsPage()
{ {
CdbOptionsPage::m_instance = 0; CdbOptionsPage::m_instance = 0;

1
src/plugins/debugger/cdb/cdboptionspage.h
View File

@@ -100,6 +100,7 @@ public:
virtual ~CdbOptionsPage(); virtual ~CdbOptionsPage();
static CdbOptionsPage *instance(); static CdbOptionsPage *instance();
static QString settingsId();
// IOptionsPage // IOptionsPage
QWidget *createPage(QWidget *parent); QWidget *createPage(QWidget *parent);