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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	src/plugins/perforce/perforceplugin.cpp
This commit is contained in:
mae
2009-01-20 17:10:34 +01:00
parent ed5afa14dd a654dc0b3a
commit 145f9c24ba
252 changed files with 3267 additions and 3035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -43,6 +43,7 @@
#include <coreplugin/minisplitter.h>
#include <coreplugin/fileiconprovider.h>
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
#include <QtCore/QDebug>
#include <QtGui/QApplication>
@@ -60,15 +61,12 @@ namespace {
bool debug = false;
}
ProjectWindow::ProjectWindow(Core::ICore *core,
QWidget *parent) :
QWidget(parent),
m_core(core)
ProjectWindow::ProjectWindow(QWidget *parent) : QWidget(parent)
{
setWindowTitle(tr("Project Explorer"));
setWindowIcon(QIcon(":/projectexplorer/images/projectexplorer.png"));
ExtensionSystem::PluginManager *pm = m_core->pluginManager();
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
ProjectExplorerPlugin *projectExplorer = m_projectExplorer = pm->getObject<ProjectExplorerPlugin>();
m_session = projectExplorer->session();