forked from qt-creator/qt-creator
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:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user