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/qapplication.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/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index e61b17e..2f1ab0e 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -448,7 +448,7 @@ bool Q_GUI_EXPORT qt_tab_all_widgets = true; bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; static int drag_time = 500; -#ifdef Q_WS_S60 +#ifdef Q_OS_SYMBIAN // The screens are a bit too small to for your thumb when using only 4 pixels drag distance. static int drag_distance = 8; #else @@ -469,7 +469,7 @@ bool QApplicationPrivate::auto_sip_on_mouse_focus = false; bool QApplicationPrivate::inSizeMove = false; #endif #ifdef QT_KEYPAD_NAVIGATION -# if defined(Q_WS_S60) +# if defined(Q_OS_SYMBIAN) bool QApplicationPrivate::keypadNavigation = true; # else bool QApplicationPrivate::keypadNavigation = false; @@ -1963,7 +1963,9 @@ QString desktopstyle; #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS) desktopstyle = QLatin1String("CDE"); // default style for X11 on Solaris #elif defined(Q_WS_S60) - desktopstyle = QLatin1String("S60"); + desktopstyle = QLatin1String("S60"); // default style for Symbian with S60 +#elif defined(Q_OS_SYMBIAN) + desktopstyle = QLatin1String("Windows"); // default style for Symbian without S60 #elif defined(Q_WS_X11) && defined(Q_OS_IRIX) desktopstyle = QLatin1String("SGI"); // default style for X11 on IRIX #elif defined(Q_WS_QWS) @@ -5098,7 +5100,7 @@ uint QApplicationPrivate::currentPlatform(){ platform |= KB_Gnome; if (X11->desktopEnvironment == DE_CDE) platform |= KB_CDE; -#elif defined(Q_WS_S60) +#elif defined(Q_OS_SYMBIAN) platform = KB_S60; #endif return platform; |