forked from qt-creator/qt-creator
Move QtVersionManager, QtVersion and QtOptionsPage back
After all I don't need all that stuff in the cmakeplugin, all i needed is now bundled in debugginghelper.h/cpp
This commit is contained in:
@@ -39,6 +39,8 @@
|
||||
#include "embeddedpropertiespage.h"
|
||||
#include "qt4runconfiguration.h"
|
||||
#include "profilereader.h"
|
||||
#include "qtversionmanager.h"
|
||||
#include "qtoptionspage.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
@@ -47,7 +49,6 @@
|
||||
#include <projectexplorer/projectexplorer.h>
|
||||
#include <projectexplorer/projectexplorerconstants.h>
|
||||
#include <projectexplorer/projectnodes.h>
|
||||
#include <projectexplorer/qtversionmanager.h>
|
||||
#include <coreplugin/uniqueidmanager.h>
|
||||
#include <coreplugin/mimedatabase.h>
|
||||
#include <coreplugin/actionmanager/actionmanager.h>
|
||||
@@ -64,7 +65,6 @@
|
||||
using namespace Qt4ProjectManager::Internal;
|
||||
using namespace Qt4ProjectManager;
|
||||
using ProjectExplorer::Project;
|
||||
using ProjectExplorer::QtVersionManager;
|
||||
|
||||
Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin()
|
||||
{
|
||||
@@ -97,9 +97,14 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
|
||||
return false;
|
||||
|
||||
m_projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
|
||||
|
||||
Core::ActionManager *am = core->actionManager();
|
||||
|
||||
QtVersionManager::m_self = new QtVersionManager();
|
||||
addAutoReleasedObject(QtVersionManager::m_self);
|
||||
|
||||
addAutoReleasedObject(new QtOptionsPage());
|
||||
|
||||
|
||||
//create and register objects
|
||||
m_qt4ProjectManager = new Qt4Manager(this);
|
||||
addObject(m_qt4ProjectManager);
|
||||
|
||||
Reference in New Issue
Block a user