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_s60.cpp | |
| 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_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 6109f17..3149a7e 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -144,7 +144,7 @@ void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys) nativeContainer->DrawDeferred(); // 3.1 needs an extra invitation } -void QWidgetPrivate::setWSGeometry(bool dontShow) +void QWidgetPrivate::setWSGeometry(bool, const QRect &) { } |