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/qt_s60_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/qt_s60_p.h')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 2d47a14..bcbe48f 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -65,11 +65,14 @@ #include <coecntrl.h> #include <eikenv.h> #include <eikappui.h> + +#ifdef Q_WS_S60 #include <aknutils.h> // AknLayoutUtils #include <avkon.hrh> // EEikStatusPaneUidTitle #include <akntitle.h> // CAknTitlePane #include <akncontext.h> // CAknContextPane #include <eikspane.h> // CEikStatusPane +#endif QT_BEGIN_NAMESPACE @@ -102,11 +105,13 @@ public: static inline RWindowGroup& windowGroup(); static inline CWsScreenDevice* screenDevice(); static inline CCoeAppUi* appUi(); +#ifdef Q_WS_S60 static inline CEikStatusPane* statusPane(); static inline CCoeControl* statusPaneSubPane(TInt aPaneId); static inline CAknTitlePane* titlePane(); static inline CAknContextPane* contextPane(); static inline CEikButtonGroupContainer* buttonGroupContainer(); +#endif }; class QAbstractLongTapObserver @@ -129,7 +134,7 @@ public: void HandleResourceChange(int resourceType); void HandlePointerEventL(const TPointerEvent& aPointerEvent); TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType); -#ifndef QT_NO_IM +#if !defined(QT_NO_IM) && defined(Q_WS_S60) TCoeInputCapabilities InputCapabilities() const; #endif TTypeUid::Ptr MopSupplyObject(TTypeUid id); @@ -195,6 +200,7 @@ inline CCoeAppUi* QS60Data::appUi() return CCoeEnv::Static()-> AppUi(); } +#ifdef Q_WS_S60 inline CEikStatusPane* QS60Data::statusPane() { return CEikonEnv::Static()->AppUiFactory()->StatusPane(); @@ -230,6 +236,7 @@ inline CEikButtonGroupContainer* QS60Data::buttonGroupContainer() { return CEikonEnv::Static()->AppUiFactory()->Cba(); } +#endif // Q_WS_S60 static inline QFont qt_TFontSpec2QFontL(const TFontSpec &fontSpec) { |