diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-07-15 09:29:16 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-07-15 09:35:21 (GMT) |
commit | cd4c5a65b9d91fd84408205c3d20554122037730 (patch) | |
tree | 3495b44cf34e129c3156224fb2353949221203ee /src/gui/kernel/qwidget_p.h | |
parent | fde7966c1b6122ed904d30e1f6e83eb8cd3a80b2 (diff) | |
download | Qt-cd4c5a65b9d91fd84408205c3d20554122037730.zip Qt-cd4c5a65b9d91fd84408205c3d20554122037730.tar.gz Qt-cd4c5a65b9d91fd84408205c3d20554122037730.tar.bz2 |
Make S60 integration optional.
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r-- | src/gui/kernel/qwidget_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 8569e75..84a15ed 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -80,11 +80,9 @@ #include "QtGui/qscreen_qws.h" #endif -#if defined(Q_WS_S60) +#if defined(Q_OS_SYMBIAN) class RDrawableWindow; class CCoeControl; -class CAknTitlePane; -class CAknContextPane; // The following 2 defines may only be needed for s60. To be seen. const int SOFTKEYSTART=5000; const int SOFTKEYEND=5004; @@ -172,7 +170,7 @@ struct QTLWExtra { #ifndef QT_NO_QWS_MANAGER QWSManager *qwsManager; #endif -#elif defined(Q_WS_S60) // <--------------------------------------------------------- SYMBIAN +#elif defined(Q_OS_SYMBIAN) // <--------------------------------------------------------- SYMBIAN uint activated : 1; // RWindowBase::Activated has been called RDrawableWindow *rwindow; #endif @@ -663,7 +661,7 @@ public: void updateCursor() const; #endif QScreen* getScreen() const; -#elif defined(Q_WS_S60) // <--------------------------------------------------------- SYMBIAN +#elif defined(Q_OS_SYMBIAN) // <--------------------------------------------------------- SYMBIAN static QWidget *mouseGrabber; static QWidget *keyboardGrabber; void s60UpdateIsOpaque(); |