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/widgets/qmenu_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/widgets/qmenu_p.h')
| -rw-r--r-- | src/gui/widgets/qmenu_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h index b9bb544..d9ad422 100644 --- a/src/gui/widgets/qmenu_p.h +++ b/src/gui/widgets/qmenu_p.h @@ -61,7 +61,7 @@ #include "QtCore/qbasictimer.h" #include "private/qwidget_p.h" -#ifdef Q_OS_SYMBIAN +#ifdef Q_WS_S60 class CEikMenuPane; #endif QT_BEGIN_NAMESPACE @@ -123,7 +123,7 @@ struct QWceMenuAction { QWceMenuAction() : menuHandle(0), command(0) {} }; #endif -#ifdef Q_OS_SYMBIAN +#ifdef Q_WS_S60 struct QSymbianMenuAction { uint command; int parent; @@ -147,7 +147,7 @@ public: #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR) ,wce_menu(0) #endif -#ifdef Q_OS_SYMBIAN +#ifdef Q_WS_S60 ,symbian_menu(0) #endif #ifdef QT3_SUPPORT @@ -163,7 +163,7 @@ public: #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR) delete wce_menu; #endif -#ifdef Q_OS_SYMBIAN +#ifdef Q_WS_S60 delete symbian_menu; #endif @@ -336,7 +336,7 @@ public: HMENU wceMenu(bool create = false); QAction* wceCommands(uint command); #endif -#if defined(Q_OS_SYMBIAN) +#if defined(Q_WS_S60) struct QSymbianMenuPrivate { QList<QSymbianMenuAction*> actionItems; QSymbianMenuPrivate(); |