diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-04 15:21:02 (GMT) |
| commit | 793d3c2da83098e32063c4ae6df187058103bde8 (patch) | |
| tree | 7b96581a67bd66ff30b0ede18b0fbfd71d9345cf /src/gui/kernel/qwidget_p.h | |
| parent | 2d0f49df3a3c44601bf2e41ea722c2384b71aab0 (diff) | |
| parent | c2d47f6717fdccd44838f3c128693a3c09f6cf68 (diff) | |
| download | Qt-793d3c2da83098e32063c4ae6df187058103bde8.zip Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.gz Qt-793d3c2da83098e32063c4ae6df187058103bde8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index df17566..2dd3061 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -252,7 +252,8 @@ public: void macUpdateIsOpaque(); void setEnabled_helper_sys(bool enable); bool isRealWindow() const; - void applyMaxAndMinSizeConstraints(int &w, int &h); + void adjustWithinMaxAndMinSize(int &w, int &h); + void applyMaxAndMinSizeOnWindow(); #endif void raise_sys(); |