Merge remote branch 'origin/2.1'

Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp

src/plugins/debugger/debuggerengine.cpp

@@ -46,6 +46,7 @@
 #include "threadshandler.h"
 #include "watchhandler.h"
 #include "watchutils.h"
+#include "breakwindow.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -80,7 +81,7 @@
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
 #include <QtGui/QTreeWidget>
-
+#include <QtGui/QMainWindow>
 
 using namespace Core;
 using namespace Debugger;
@@ -282,6 +283,8 @@ public slots:
         m_runControl->bringApplicationToForeground(m_inferiorPid);
     }
 
+private slots:
+    void slotEditBreakpoint();
 
 public:
     DebuggerState state() const { return m_state; }
@@ -329,6 +332,17 @@ void DebuggerEnginePrivate::breakpointSetRemoveMarginActionTriggered()
     m_breakHandler.toggleBreakpoint(fileName, lineNumber, address);
 }
 
+void DebuggerEnginePrivate::slotEditBreakpoint()
+{
+    const QAction *act = qobject_cast<QAction *>(sender());
+    QTC_ASSERT(act, return);
+    const QVariant data = act->data();
+    QTC_ASSERT(qVariantCanConvert<BreakpointData *>(data), return);
+    BreakpointData *breakPointData = qvariant_cast<BreakpointData *>(data);
+    if (BreakWindow::editBreakpoint(breakPointData, ICore::instance()->mainWindow()))
+        breakPointData->reinsertBreakpoint();
+}
+
 void DebuggerEnginePrivate::breakpointEnableDisableMarginActionTriggered()
 {
     QAction *act = qobject_cast<QAction *>(sender());
@@ -388,6 +402,10 @@ void DebuggerEnginePrivate::handleContextMenuRequest(const QVariant &parameters)
         connect(act2, SIGNAL(triggered()),
             this, SLOT(breakpointEnableDisableMarginActionTriggered()));
         menu->addAction(act2);
+        QAction *editAction = new QAction(tr("Edit Breakpoint %1...").arg(number), menu);
+        connect(editAction, SIGNAL(triggered()), this, SLOT(slotEditBreakpoint()));
+        editAction->setData(qVariantFromValue(data));
+        menu->addAction(editAction);
     } else {
         // non-existing
         const QString text = address ?
@@ -1049,35 +1067,6 @@ void DebuggerEngine::showQtDumperLibraryWarning(const QString &details)
     }
 }
 
-void DebuggerEngine::showQmlObserverToolWarning()
-{
-    QMessageBox dialog(plugin()->mainWindow());
-    QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
-        QMessageBox::ActionRole);
-    QPushButton *helperOff = dialog.addButton(tr("Turn off QML Observer Usage"),
-        QMessageBox::ActionRole);
-    QPushButton *justContinue = dialog.addButton(tr("Continue Anyway"),
-        QMessageBox::AcceptRole);
-    dialog.setDefaultButton(justContinue);
-    dialog.setWindowTitle(tr("QML Observer Missing"));
-    dialog.setText(tr("QML Observer could not be found."));
-    dialog.setInformativeText(tr(
-        "QML Observer is used to offer additional debugging features for "
-        "QML applications, such as interactive debugging and inspection tools."
-        "It must be compiled for each used Qt version separately. "
-        "On the Qt4 options page, select a Qt installation "
-        "and click Rebuild."));
-    dialog.exec();
-    if (dialog.clickedButton() == qtPref) {
-        Core::ICore::instance()->showOptionsDialog(
-            _(Qt4ProjectManager::Constants::QT_SETTINGS_CATEGORY),
-            _(Qt4ProjectManager::Constants::QTVERSION_SETTINGS_PAGE_ID));
-    } else if (dialog.clickedButton() == helperOff) {
-        theDebuggerAction(UseQmlObserver)
-            ->setValue(qVariantFromValue(false), false);
-    }
-}
-
 QString DebuggerEngine::qtDumperLibraryName() const
 {
     if (theDebuggerAction(UseCustomDebuggingHelperLocation)->value().toBool())