diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index bf81c1fabdf527ff97d250249461b1d884682ba1..a9f130225d74d3c87ed015afb8fdf6620b5da1b7 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -289,8 +289,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mbuild->appendGroup(Constants::G_BUILD_SESSION); mbuild->appendGroup(Constants::G_BUILD_PROJECT); mbuild->appendGroup(Constants::G_BUILD_OTHER); - mbuild->appendGroup(Constants::G_BUILD_RUN); mbuild->appendGroup(Constants::G_BUILD_CANCEL); + mbuild->appendGroup(Constants::G_BUILD_RUN); msessionContextMenu->appendGroup(Constants::G_SESSION_BUILD); msessionContextMenu->appendGroup(Constants::G_SESSION_FILES); @@ -539,10 +539,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er cmd = am->registerAction(m_cleanProjectOnlyAction, Constants::CLEANPROJECTONLY, globalcontext); // Add Set Build Configuration to menu - mbuild->addMenu(mbc, Constants::G_BUILD_PROJECT); + mbuild->addMenu(mbc, Constants::G_BUILD_OTHER); mproject->addMenu(mbc, Constants::G_PROJECT_CONFIG); - // run action QIcon runIcon(Constants::ICON_RUN); runIcon.addFile(Constants::ICON_RUN_SMALL); diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index 5e27b68fc8ef7777e71cff107aa9bdc9a64d4f0f..3f1d36264dd09ad0c6826bea131b1f9be5aff4a0 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -158,7 +158,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString * qmakeIcon.addFile(QLatin1String(":/qt4projectmanager/images/run_qmake_small.png")); m_runQMakeAction = new QAction(qmakeIcon, tr("Run qmake"), this); command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, context); - mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_RUN); + mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_PROJECT); connect(m_runQMakeAction, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMake())); m_runQMakeActionContextMenu = new QAction(qmakeIcon, tr("Run qmake"), this); @@ -166,7 +166,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString * mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); connect(m_runQMakeActionContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(runQMakeContextMenu())); - connect(m_projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)));