diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 229e8355ff47bb9dceaa1c068202ff23e7e3f186..76a9d75236c9934942876112b9d456ae9b2d37bd 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -230,6 +230,7 @@ public: m_startParameters(sp), m_state(DebuggerNotReady), m_lastGoodState(DebuggerNotReady), + m_targetState(DebuggerNotReady), m_breakHandler(engine), m_commandHandler(engine), m_modulesHandler(engine), diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 1bbe67b45bc3fdaabd3973d1c5efa24fee254917..eb63ae331505c1d8e61f1a2ce0abe776bcb3137b 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -51,6 +51,7 @@ #include <QtCore/QTimer> #include <QtCore/QSettings> #include <QtCore/QXmlStreamReader> +#include <QtCore/QScopedPointer> #include <QtGui/QDialogButtonBox> #include <QtGui/QFont> #include <QtGui/QMessageBox> @@ -169,7 +170,7 @@ void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath, QMenu *cppMenu = new QMenu(ui->cppExamplesButton); ui->cppExamplesButton->setMenu(cppMenu); - QMenu *subMenu = 0; + QScopedPointer<QMenu> subMenu; bool inExamples = false; QString dirName; QXmlStreamReader reader(&description); @@ -182,7 +183,7 @@ void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath, if (name.contains(QLatin1String("tutorial"))) break; dirName = reader.attributes().value(QLatin1String("dirname")).toString(); - subMenu = new QMenu(name); + subMenu.reset(new QMenu(name)); inExamples = true; } if (inExamples && reader.name() == QLatin1String("example")) { @@ -218,11 +219,8 @@ void GettingStartedWelcomePageWidget::updateExamples(const QString &examplePath, break; case QXmlStreamReader::EndElement: if (reader.name() == QLatin1String("category")) { - if (subMenu->actions().isEmpty()) - delete subMenu; - else - cppMenu->addMenu(subMenu); - + if (!subMenu->actions().isEmpty()) + cppMenu->addMenu(subMenu.take()); inExamples = false; } break;