diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:13:19 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:13:19 (GMT) |
| commit | d7acc28c68ae02b530ba53667b165e844293b4e9 (patch) | |
| tree | dfdbe536a27a76350f10e13803ad3ab5c64f703b /src/gui | |
| parent | e67cd6560eea4e4b600d5e3586cd823347e101d2 (diff) | |
| parent | 70b5327e51481bf7b91d8fad50e3fc9ff3a1e888 (diff) | |
| download | Qt-d7acc28c68ae02b530ba53667b165e844293b4e9.zip Qt-d7acc28c68ae02b530ba53667b165e844293b4e9.tar.gz Qt-d7acc28c68ae02b530ba53667b165e844293b4e9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/egl/qegl.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qwindowscestyle.cpp | 6 | ||||
| -rw-r--r-- | src/gui/styles/qwindowsmobilestyle.cpp | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index ebdac9a..1c45a58 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -95,7 +95,7 @@ bool QEglContext::chooseConfig do { // Get the number of matching configurations for this set of properties. EGLint matching = 0; - if (!eglChooseConfig(dpy, props.properties(), 0, 256, &matching) || !matching) + if (!eglChooseConfig(dpy, props.properties(), 0, 0, &matching) || !matching) continue; // If we want the best pixel format, then return the first diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/gui/styles/qwindowscestyle.cpp index 997fc72..cd13dd8 100644 --- a/src/gui/styles/qwindowscestyle.cpp +++ b/src/gui/styles/qwindowscestyle.cpp @@ -1951,7 +1951,11 @@ QRect QWindowsCEStyle::subControlRect(ComplexControl control, const QStyleOption rect = QRect(x, y , bs.width(), bs.height()); break; case SC_SpinBoxEditField: - rect = QRect(lx, fw, rx-2, spinbox->rect.height() - 2*fw); + if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) { + rect = QRect(lx, fw, spinbox->rect.width() - 2*fw - 2, spinbox->rect.height() - 2*fw); + } else { + rect = QRect(lx, fw, rx-2, spinbox->rect.height() - 2*fw); + } break; case SC_SpinBoxFrame: rect = spinbox->rect; diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/gui/styles/qwindowsmobilestyle.cpp index c70b4c8..e708042 100644 --- a/src/gui/styles/qwindowsmobilestyle.cpp +++ b/src/gui/styles/qwindowsmobilestyle.cpp @@ -2984,7 +2984,11 @@ QRect QWindowsMobileStyle::subControlRect(ComplexControl control, const QStyleOp rect = QRect(x + bs.width(), 0, bs.width(), bs.height()); break; case SC_SpinBoxEditField: + if (spinBox->buttonSymbols == QAbstractSpinBox::NoButtons) { + rect = QRect(lx, fw, spinBox->rect.width() - 2*fw - 2, spinBox->rect.height() - 2*fw); + } else { rect = QRect(lx, fw, rx-2, spinBox->rect.height() - 2*fw); + } break; case SC_SpinBoxFrame: rect = spinBox->rect; |