diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-06-26 09:35:16 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-29 12:07:00 (GMT) |
| commit | f1d3ed3a4adc2f1859102afb03b5c794d569940c (patch) | |
| tree | a27602762705501c80fe689aac23c376612aa77e /src/gui/kernel/qwidget_p.h | |
| parent | db8f05e257019694f5e8076845626008f2adc3dd (diff) | |
| download | Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.zip Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.tar.gz Qt-f1d3ed3a4adc2f1859102afb03b5c794d569940c.tar.bz2 | |
Manually fix bad merges and make sure everything compiles with 4.6.
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 527e331..e17c236 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -282,9 +282,6 @@ public: QPalette naturalWidgetPalette(uint inheritedMask) const; void setMask_sys(const QRegion &); -#ifdef Q_WS_S60 - void s60UpdateIsOpaque(); -#endif void raise_sys(); void lower_sys(); @@ -658,8 +655,10 @@ public: #elif defined(Q_WS_S60) // <--------------------------------------------------------- SYMBIAN static QWidget *mouseGrabber; static QWidget *keyboardGrabber; + void s60UpdateIsOpaque(); + void reparentChildren(); #endif - + }; inline QWExtra *QWidgetPrivate::extraData() const |