summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_p.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-04-23 09:02:14 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-04-23 09:02:14 (GMT)
commit429f29a305559313f92866ac19cf224ad1497b33 (patch)
tree8f8cc1dd5f6485d3282eec52c83a9fbeb71dd29e /src/gui/kernel/qwidget_p.h
parent33afa6c1fbe230dec4eea435f9ad5d4141c128a8 (diff)
parentbe3916b7e4e8007394cbed40484ef6b696e90f2b (diff)
downloadQt-429f29a305559313f92866ac19cf224ad1497b33.zip
Qt-429f29a305559313f92866ac19cf224ad1497b33.tar.gz
Qt-429f29a305559313f92866ac19cf224ad1497b33.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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 9e93f66..423e833 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -257,6 +257,7 @@ public:
void macUpdateIsOpaque();
void setEnabled_helper_sys(bool enable);
bool isRealWindow() const;
+ void applyMaxAndMinSizeConstraints(int &w, int &h);
#endif
void raise_sys();