summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_p.h
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-04-30 13:24:55 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-04-30 13:24:55 (GMT)
commit32493498dcf3aa1ab9973aab381c5ca99d9ba9fd (patch)
treecb46e87a358289adbc5c58d74521676add50435e /src/gui/kernel/qwidget_p.h
parentb20ca123c521a1dae695045211c253c221ed604a (diff)
parent4b1137345a0bbfedc348b020ad0ad6e5720eb6d1 (diff)
downloadQt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.zip
Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.gz
Qt-32493498dcf3aa1ab9973aab381c5ca99d9ba9fd.tar.bz2
Merge commit 'private/translucentWindows'
Conflicts: src/gui/styles/qs60style_symbian.cpp
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r--src/gui/kernel/qwidget_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index ec64b6e..19f4b98 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -270,6 +270,10 @@ public:
void applyMaxAndMinSizeConstraints(int &w, int &h);
#endif
+#ifdef Q_WS_S60
+ void s60UpdateIsOpaque();
+#endif
+
void raise_sys();
void lower_sys();
void stackUnder_sys(QWidget *);