diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-06 16:40:00 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-06 16:40:00 (GMT) |
| commit | 93922e26a2411c0f11e7cdc49b306823e23cda8b (patch) | |
| tree | 8ae5ae8eff95dc4793d67d50e04d1855cfcc07e4 /src/gui/kernel | |
| parent | fcb5ca1ef0a1c1639624d951b03750abc631e60d (diff) | |
| download | Qt-93922e26a2411c0f11e7cdc49b306823e23cda8b.zip Qt-93922e26a2411c0f11e7cdc49b306823e23cda8b.tar.gz Qt-93922e26a2411c0f11e7cdc49b306823e23cda8b.tar.bz2 | |
Fixes to make gui compile after clean configure. Removal
of QSoftKeyStack broke compilation on clean environment...
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 9a606dc..2119849 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -84,6 +84,9 @@ class RDrawableWindow; class CCoeControl; class CAknTitlePane; class CAknContextPane; +// The following 2 defines may only be needed for s60. To be seen. +#define SOFTKEYSTART 5000 +#define SOFTKEYEND (5000 + Qt::Key_Context4-Qt::Key_Context1) #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index a23469e..4e03206 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -62,9 +62,6 @@ QWidget *QWidgetPrivate::mouseGrabber = 0; QWidget *QWidgetPrivate::keyboardGrabber = 0; #define QSoftkeySet QList <QAction*> -// The following 2 defines may only be needed for s60. To be seen. -#define SOFTKEYSTART 5000 -#define SOFTKEYEND (5000 + Qt::Key_Context4-Qt::Key_Context1) static void mapSoftKeys(const QSoftkeySet &softkeys) { |