diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-02 13:31:07 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-12-02 13:31:07 (GMT) |
| commit | f29f1bb287c6b39bd1270802d1579f1c1d53f905 (patch) | |
| tree | f903e18b163591c3590473e4a117a3c8958d8847 /src/gui/graphicsview/qgraphicswidget.cpp | |
| parent | 271936b063fb261293e3f77f7a2273e3a4dbb5d6 (diff) | |
| parent | 25023911295c201758faaa2c800b2388ddf1e0b0 (diff) | |
| download | Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.zip Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.gz Qt-f29f1bb287c6b39bd1270802d1579f1c1d53f905.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index f6c06d5..fe569f4 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1301,7 +1301,8 @@ bool QGraphicsWidget::event(QEvent *event) case QEvent::Polish: polishEvent(); d->polished = true; - d->updateFont(d->font); + if (!d->font.isCopyOf(QApplication::font())) + d->updateFont(d->font); break; case QEvent::WindowActivate: case QEvent::WindowDeactivate: |