diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 11:25:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 11:25:36 (GMT) |
| commit | f6f9777408691a945c49ef8ec5037d8401c747eb (patch) | |
| tree | 130c6e4dafffaccdc14add85e4e37d20857e07c0 /src/gui/widgets | |
| parent | a9fc5b40355eb217d195df3a22fa2e83b2f641a3 (diff) | |
| parent | 27668f4df1756225cfa07fe4195024b501d66d25 (diff) | |
| download | Qt-f6f9777408691a945c49ef8ec5037d8401c747eb.zip Qt-f6f9777408691a945c49ef8ec5037d8401c747eb.tar.gz Qt-f6f9777408691a945c49ef8ec5037d8401c747eb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes selection being cleared when right clicking on a selected item.
QCheckBox did not have a minimumSizeHint()
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcheckbox.cpp | 9 | ||||
| -rw-r--r-- | src/gui/widgets/qcheckbox.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/widgets/qcheckbox.cpp b/src/gui/widgets/qcheckbox.cpp index bc0900e..64b47b4 100644 --- a/src/gui/widgets/qcheckbox.cpp +++ b/src/gui/widgets/qcheckbox.cpp @@ -300,6 +300,15 @@ QSize QCheckBox::sizeHint() const return d->sizeHint; } + +/*! + \reimp +*/ +QSize QCheckBox::minimumSizeHint() const +{ + return sizeHint(); +} + /*! \reimp */ diff --git a/src/gui/widgets/qcheckbox.h b/src/gui/widgets/qcheckbox.h index 7b6292d..95da261 100644 --- a/src/gui/widgets/qcheckbox.h +++ b/src/gui/widgets/qcheckbox.h @@ -65,6 +65,7 @@ public: QSize sizeHint() const; + QSize minimumSizeHint() const; void setTristate(bool y = true); bool isTristate() const; |