forked from qt-creator/qt-creator
projectexplorer: move project{Context,Language} from IProjectManager to Project
Reviewed-by: dt
This commit is contained in:
@@ -108,7 +108,7 @@ Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
|
||||
bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
||||
{
|
||||
Q_UNUSED(arguments)
|
||||
m_projectContext = Core::Context(Qt4ProjectManager::Constants::PROJECT_ID);
|
||||
const Core::Context projectContext(Qt4ProjectManager::Constants::PROJECT_ID);
|
||||
|
||||
ProFileParser::initialize();
|
||||
ProFileEvaluator::initialize();
|
||||
@@ -199,13 +199,13 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
|
||||
QIcon qmakeIcon(QLatin1String(":/qt4projectmanager/images/run_qmake.png"));
|
||||
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, m_projectContext);
|
||||
command = am->registerAction(m_runQMakeAction, Constants::RUNQMAKE, projectContext);
|
||||
command->setAttribute(Core::Command::CA_Hide);
|
||||
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);
|
||||
command = am->registerAction(m_runQMakeActionContextMenu, Constants::RUNQMAKECONTEXTMENU, m_projectContext);
|
||||
command = am->registerAction(m_runQMakeActionContextMenu, Constants::RUNQMAKECONTEXTMENU, projectContext);
|
||||
command->setAttribute(Core::Command::CA_Hide);
|
||||
mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
|
||||
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
|
||||
@@ -214,7 +214,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
|
||||
QIcon buildIcon(ProjectExplorer::Constants::ICON_BUILD);
|
||||
buildIcon.addFile(ProjectExplorer::Constants::ICON_BUILD_SMALL);
|
||||
m_buildSubProjectContextMenu = new QAction(buildIcon, tr("Build"), this);
|
||||
command = am->registerAction(m_buildSubProjectContextMenu, Constants::BUILDSUBDIR, m_projectContext);
|
||||
command = am->registerAction(m_buildSubProjectContextMenu, Constants::BUILDSUBDIR, projectContext);
|
||||
command->setAttribute(Core::Command::CA_Hide);
|
||||
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
|
||||
connect(m_buildSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(buildSubDirContextMenu()));
|
||||
@@ -222,7 +222,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
|
||||
QIcon rebuildIcon(ProjectExplorer::Constants::ICON_REBUILD);
|
||||
rebuildIcon.addFile(ProjectExplorer::Constants::ICON_REBUILD_SMALL);
|
||||
m_rebuildSubProjectContextMenu = new QAction(rebuildIcon, tr("Rebuild"), this);
|
||||
command = am->registerAction(m_rebuildSubProjectContextMenu, Constants::REBUILDSUBDIR, m_projectContext);
|
||||
command = am->registerAction(m_rebuildSubProjectContextMenu, Constants::REBUILDSUBDIR, projectContext);
|
||||
command->setAttribute(Core::Command::CA_Hide);
|
||||
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
|
||||
connect(m_rebuildSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(rebuildSubDirContextMenu()));
|
||||
@@ -230,7 +230,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
|
||||
QIcon cleanIcon(ProjectExplorer::Constants::ICON_CLEAN);
|
||||
cleanIcon.addFile(ProjectExplorer::Constants::ICON_CLEAN_SMALL);
|
||||
m_cleanSubProjectContextMenu = new QAction(cleanIcon, tr("Clean"), this);
|
||||
command = am->registerAction(m_cleanSubProjectContextMenu, Constants::CLEANSUBDIR, m_projectContext);
|
||||
command = am->registerAction(m_cleanSubProjectContextMenu, Constants::CLEANSUBDIR, projectContext);
|
||||
command->setAttribute(Core::Command::CA_Hide);
|
||||
msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD);
|
||||
connect(m_cleanSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(cleanSubDirContextMenu()));
|
||||
|
||||
Reference in New Issue
Block a user