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

Merge remote-tracking branch 'origin/2.8' into HEAD

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
This commit is contained in:
Eike Ziller
2013-07-03 16:55:27 +02:00
parent 99647b89e5 b05603a44d
commit 8685ff8a28
61 changed files with 1036 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/outputpane.cpp
View File

@@ -144,6 +144,7 @@ void OutputPanePlaceHolder::ensureSizeHintAsMinimum()
if (idx < 0)
return;
d->m_splitter->refresh();
QList<int> sizes = d->m_splitter->sizes();
Internal::OutputPaneManager *om = Internal::OutputPaneManager::instance();
int minimum = (d->m_splitter->orientation() == Qt::Vertical