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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
This commit is contained in:
Eike Ziller
2011-08-10 16:03:57 +02:00
parent 01bb7443fd d78d7dbce3
commit 99ba300ae3
140 changed files with 1585 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/helpplugin.cpp
View File

@@ -261,7 +261,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(slotOpenSupportPage()));
action = new QAction(tr("Report Bug"), this);
action = new QAction(tr("Report Bug..."), this);
cmd = am->registerAction(action, Core::Id("Help.ReportBug"), globalcontext);
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(slotReportBug()));
@@ -271,7 +271,6 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
action->setSeparator(true);
cmd = am->registerAction(action, Core::Id("Help.Separator2"), globalcontext);
am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateContext()));
#endif
action = new QAction(this);