Merge remote branch 'origin/2.2'

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
This commit is contained in:
con
2011-04-01 09:53:09 +02:00
140 changed files with 1139 additions and 2743 deletions

View File

@@ -117,7 +117,6 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent)
this, SLOT(filesAboutToBeRemoved(FolderNode *, const QList<FileNode*> &)));
m_view = new ProjectTreeView;
m_view->header()->setStretchLastSection(true);
m_view->setModel(m_model);
setFocusProxy(m_view);
initView();