diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:02:01 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:02:01 (GMT) |
| commit | 3945fd75a93d790434b33c2d23add155893a82a4 (patch) | |
| tree | e83166a337857381d1c152d0bb9c0f1c5d101efc /src | |
| parent | f7e13aefc24b98299d8fd44cad60cc13b16e4114 (diff) | |
| parent | aa863c61ec5e68ff73c02e25a2954cdba9c2ef15 (diff) | |
| download | Qt-3945fd75a93d790434b33c2d23add155893a82a4.zip Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.gz Qt-3945fd75a93d790434b33c2d23add155893a82a4.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/gui/itemviews/qheaderview.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/itemviews/qheaderview.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_win.cpp | 4 | ||||
| -rw-r--r-- | src/gui/styles/qplastiquestyle.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp index fc9820f..a754579 100644 --- a/src/gui/itemviews/qheaderview.cpp +++ b/src/gui/itemviews/qheaderview.cpp @@ -524,8 +524,10 @@ QSize QHeaderView::sizeHint() const Q_D(const QHeaderView); if (d->cachedSizeHint.isValid()) return d->cachedSizeHint; - d->cachedSizeHint = QSize(0, 0); //reinitialize the cached size hint + int width = 0; + int height = 0; const int sectionCount = count(); + d->executePostedLayout(); // get size hint for the first n sections int i = 0; diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/kernel/qkeymapper_win.cpp index 10958f3..be207df 100644 --- a/src/gui/kernel/qkeymapper_win.cpp +++ b/src/gui/kernel/qkeymapper_win.cpp @@ -905,8 +905,8 @@ bool QKeyMapperPrivate::translateKeyEvent(QWidget *widget, const MSG &msg, bool if(msg.wParam == VK_PROCESSKEY) return true; - // Ignore invalid virtual keycode (see bug 127424) - if (msg.wParam == 0xFF) + // Ignore invalid virtual keycodes (see bugs 127424, QTBUG-3630) + if (msg.wParam == 0 || msg.wParam == 0xFF) return true; // Translate VK_* (native) -> Key_* (Qt) keys diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp index 5052755..ce2109a 100644 --- a/src/gui/styles/qplastiquestyle.cpp +++ b/src/gui/styles/qplastiquestyle.cpp @@ -3309,7 +3309,7 @@ void QPlastiqueStyle::drawControl(ControlElement element, const QStyleOption *op // Draw the text centered QFont font = painter->font(); - font.setPointSize(font.pointSize() - 1); + font.setPointSize(QFontInfo(font).pointSize() - 1); painter->setFont(font); painter->setPen(dockWidget->palette.windowText().color()); painter->drawText(titleRect, |