diff options
| author | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-08 19:42:31 (GMT) |
| commit | a2c2c71ecd84e90f72697dfd57544c8d506c78e2 (patch) | |
| tree | c5e31ff16e2471d33a124a6a37f4e48acdacd235 /src/gui/kernel/qwidget.h | |
| parent | 6326227674efa85c1a5320141041110d211efc75 (diff) | |
| parent | 260005374b9b930aa583cd117aba96f8f4b34131 (diff) | |
| download | Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.zip Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.gz Qt-a2c2c71ecd84e90f72697dfd57544c8d506c78e2.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
tools/qvfb/qvfbshmem.cpp
Diffstat (limited to 'src/gui/kernel/qwidget.h')
| -rw-r--r-- | src/gui/kernel/qwidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index 1a9987d..8306ed4 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -806,7 +806,7 @@ private: Q_DISABLE_COPY(QWidget) Q_PRIVATE_SLOT(d_func(), void _q_showIfNotHidden()) #ifdef Q_OS_SYMBIAN - Q_PRIVATE_SLOT(d_func(), void _q_delayedDestroy(WId winId)) + Q_PRIVATE_SLOT(d_func(), void void _q_cleanupWinIds()) #endif QWidgetData *data; |