diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:38:36 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-04 06:38:36 (GMT) |
| commit | 764f558846b8ee6f115004fc939b890991c40bfa (patch) | |
| tree | 9bd47140cedbc9d8d28702618e6ad86fa6f2f666 /src/gui/kernel/qt_s60_p.h | |
| parent | 9b0c0faf73dbdc382f1c02a42b10018bf9961d72 (diff) | |
| parent | 1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (diff) | |
| download | Qt-764f558846b8ee6f115004fc939b890991c40bfa.zip Qt-764f558846b8ee6f115004fc939b890991c40bfa.tar.gz Qt-764f558846b8ee6f115004fc939b890991c40bfa.tar.bz2 | |
Merge branch '4.6' of c:\dev\qt-graphics-4.6
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'src/gui/kernel/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index e25bc81..789d89e 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -124,6 +124,8 @@ public: static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); + + TTrapHandler *s60InstalledTrapHandler; #endif }; |