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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
This commit is contained in:
Oswald Buddenhagen
2010-10-18 20:59:12 +02:00
parent f3cb1f0bf3 9240ceaf35
commit dfee3388af
108 changed files with 1578 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -4724,7 +4724,7 @@ void BaseTextEditor::changeEvent(QEvent *e)
|| e->type() == QEvent::FontChange) {
if (d->m_extraArea) {
QFont f = d->m_extraArea->font();
f.setPointSize(font().pointSize());
f.setPointSizeF(font().pointSizeF());
d->m_extraArea->setFont(f);
slotUpdateExtraAreaWidth();
d->m_extraArea->update();