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>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 280c8d2..a575199 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -72,7 +72,7 @@
 #include "qfontengine_qpf_p.h"
 #endif
 #endif
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
 #include "qt_s60_p.h"
 #endif
 
@@ -172,7 +172,7 @@ Q_GUI_EXPORT int qt_defaultDpiX()
     if (!subScreens.isEmpty())
         screen = subScreens.at(0);
     dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4)));
-#elif defined(Q_WS_S60)
+#elif defined(Q_OS_SYMBIAN)
     dpi = S60->defaultDpiX;
 #endif // Q_WS_X11
 
@@ -200,7 +200,7 @@ Q_GUI_EXPORT int qt_defaultDpiY()
     if (!subScreens.isEmpty())
         screen = subScreens.at(0);
     dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4)));
-#elif defined(Q_WS_S60)
+#elif defined(Q_OS_SYMBIAN)
     dpi = S60->defaultDpiY;
 #endif // Q_WS_X11
 
@@ -793,7 +793,7 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
     resolve_mask = QFont::FamilyResolved;
 
     if (pointSize <= 0) {
-#ifdef Q_WS_S60
+#ifdef Q_OS_SYMBIAN
         pointSize = 7;
 #else
         pointSize = 12;