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_symbian.cpp | |
| 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_symbian.cpp')
| -rw-r--r-- | src/gui/widgets/qmenu_symbian.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp index 69ce981..76057e7 100644 --- a/src/gui/widgets/qmenu_symbian.cpp +++ b/src/gui/widgets/qmenu_symbian.cpp @@ -44,17 +44,21 @@ #include "qstyle.h" #include "qdebug.h" #include "qwidgetaction.h" -#include <eikmenub.h> -#include <eikmenup.h> #include <private/qapplication_p.h> #include <private/qmenu_p.h> #include <private/qmenubar_p.h> #include <qt_s60_p.h> +#include <QtCore/qlibrary.h> + +#ifdef Q_WS_S60 +#include <eikmenub.h> +#include <eikmenup.h> #include <eikaufty.h> #include <eikbtgpc.h> -#include <QtCore/qlibrary.h> #include <avkon.rsg> -#ifndef QT_NO_MENUBAR +#endif + +#if !defined(QT_NO_MENUBAR) && defined(Q_WS_S60) QT_BEGIN_NAMESPACE |