Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

16 files changed, 121 insertions, 201 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index e0ca27c..75524a0 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1401,16 +1401,19 @@ public:
     enum InputMethodHint {
         ImhNone = 0x0,
         ImhHiddenText = 0x1,
-        ImhDigitsOnly = 0x2,
-        ImhFormattedNumbersOnly = 0x4,
-        ImhUppercaseOnly = 0x8,
-        ImhLowercaseOnly = 0x10,
-        ImhNoAutoUppercase = 0x20,
-        ImhPreferNumbers = 0x40,
-        ImhPreferUppercase = 0x80,
-        ImhPreferLowercase = 0x100,
-        ImhNoPredictiveText = 0x200,
-        ImhDialableCharactersOnly = 0x400
+        ImhNoAutoUppercase = 0x2,
+        ImhPreferNumbers = 0x4,
+        ImhPreferUppercase = 0x8,
+        ImhPreferLowercase = 0x10,
+        ImhNoPredictiveText = 0x20,
+
+        ImhDigitsOnly = 0x10000,
+        ImhFormattedNumbersOnly = 0x20000,
+        ImhUppercaseOnly = 0x40000,
+        ImhLowercaseOnly = 0x80000,
+        ImhDialableCharactersOnly = 0x100000,
+
+        ImhExclusiveInputMask = 0xffff0000
     };
     Q_DECLARE_FLAGS(InputMethodHints, InputMethodHint)
 
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index fb002a3..eaaeb4b 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -4764,7 +4764,7 @@ void QApplicationPrivate::emitLastWindowClosed()
 
     If \a enable is true, Qt::Key_Up and Qt::Key_Down are used to change focus.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa keypadNavigationEnabled()
 */
@@ -4775,9 +4775,9 @@ void QApplication::setKeypadNavigationEnabled(bool enable)
 
 /*!
     Returns true if Qt is set to use keypad navigation; otherwise returns
-    false. The default is false.
+    false.  The default value is true on Symbian, but false on other platforms.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa setKeypadNavigationEnabled()
 */
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 5b2c1fb..b4658da 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -1011,6 +1011,7 @@ int QApplication::s60ProcessEvent(TWsEvent *event)
             } else if ((visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible)
                        && !w->d_func()->maybeBackingStore()) {
                 w->d_func()->topData()->backingStore = new QWidgetBackingStore(w);
+                w->update();
             }
             return 1;
         }
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index dae4179..4fcedb4 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -2046,17 +2046,20 @@ static inline void fillRegion(QPainter *painter, const QRegion &rgn, const QPoin
         // Defined in qmacstyle_mac.cpp
         extern void qt_mac_fill_background(QPainter *painter, const QRegion &rgn, const QPoint &offset, const QBrush &brush);
         qt_mac_fill_background(painter, rgn, offset, brush);
-#elif defined(Q_WS_S60)
-        // Defined in qs60style_symbian.cpp
-        extern void qt_s60_fill_background(QPainter *painter, const QRegion &rgn,
-                        const QPoint &offset, const QBrush &brush);
-        qt_s60_fill_background(painter, rgn, offset, brush);
 #else
-        const QRegion translated = rgn.translated(offset);
-        const QRect rect(translated.boundingRect());
-        painter->setClipRegion(translated);
-        painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
-#endif
+#if !defined(QT_NO_STYLE_S60)
+        // Defined in qs60style.cpp
+        extern bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn,
+                        const QPoint &offset, const QBrush &brush);
+        if (!qt_s60_fill_background(painter, rgn, offset, brush))
+#endif // !defined(QT_NO_STYLE_S60)
+        {
+            const QRegion translated = rgn.translated(offset);
+            const QRect rect(translated.boundingRect());
+            painter->setClipRegion(translated);
+            painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
+        }
+#endif // Q_WS_MAC
     } else {
         const QVector<QRect> &rects = rgn.rects();
         for (int i = 0; i < rects.size(); ++i)
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 5f7c083..930602b 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -57,7 +57,6 @@ const QS60StylePrivate::SkinElementFlags QS60StylePrivate::KDefaultSkinElementFl
 static const QByteArray propertyKeyLayouts = "layouts";
 static const QByteArray propertyKeyCurrentlayout = "currentlayout";
 
-#if defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
 const layoutHeader QS60StylePrivate::m_layoutHeaders[] = {
 // *** generated layout data ***
 {240,320,1,14,true,QLatin1String("QVGA Landscape Mirrored")},
@@ -93,7 +92,6 @@ const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 };
 
 const short *QS60StylePrivate::m_pmPointer = QS60StylePrivate::data[0];
-#endif // defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
 
 // theme background texture
 QPixmap *QS60StylePrivate::m_background = 0;
@@ -119,6 +117,11 @@ static const int frameElementsCount =
 
 const int KNotFound = -1;
 
+QS60StylePrivate::~QS60StylePrivate()
+{
+    deleteBackground();
+}
+
 void QS60StylePrivate::drawSkinElement(SkinElements element, QPainter *painter,
     const QRect &rect, SkinElementFlags flags)
 {
@@ -252,10 +255,18 @@ void QS60StylePrivate::drawSkinPart(QS60StyleEnums::SkinParts part,
     drawPart(part, painter, rect, flags);
 }
 
+short QS60StylePrivate::pixelMetric(int metric)
+{
+    Q_ASSERT(metric < MAX_PIXELMETRICS);
+    const short returnValue = m_pmPointer[metric];
+    if (returnValue==-909)
+        return -1;
+    return returnValue;
+}
+
 void QS60StylePrivate::setStyleProperty(const char *name, const QVariant &value)
 {
     if (name == propertyKeyCurrentlayout) {
-#if !defined(QT_WS_S60) || defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
         static const QStringList layouts = styleProperty(propertyKeyLayouts).toStringList();
         const QString layout = value.toString();
         Q_ASSERT(layouts.contains(layout));
@@ -265,24 +276,17 @@ void QS60StylePrivate::setStyleProperty(const char *name, const QVariant &value)
         clearCaches();
         refreshUI();
         return;
-#else
-        qFatal("Cannot set static layout. Dynamic layouts are used!");
-#endif
     }
 }
 
 QVariant QS60StylePrivate::styleProperty(const char *name) const
 {
     if (name == propertyKeyLayouts) {
-#if !defined(QT_WS_S60) || defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
         static QStringList layouts;
         if (layouts.isEmpty())
             for (int i = 0; i < QS60StylePrivate::m_numberOfLayouts; i++)
                 layouts.append(QS60StylePrivate::m_layoutHeaders[i].layoutName);
         return layouts;
-#else
-        qFatal("Cannot return list of 'canned' static layouts. Dynamic layouts are used!");
-#endif
     }
     return QVariant();
 }
@@ -364,6 +368,7 @@ void QS60StylePrivate::clearCaches(QS60StylePrivate::CacheClearReason reason)
         m_colorCache.clear();
         QPixmapCache::clear();
         deleteBackground();
+        break;
     case CC_UndefinedChange:
     default:
         m_colorCache.clear();
@@ -575,13 +580,10 @@ int QS60StylePrivate::focusRectPenWidth()
     return pixelMetric(QS60Style::PM_DefaultFrameWidth);
 }
 
-#if !defined(QT_WS_S60) || defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
 void QS60StylePrivate::setCurrentLayout(int index)
 {
     m_pmPointer = data[index];
 }
-#endif
-
 
 void QS60StylePrivate::drawPart(QS60StyleEnums::SkinParts skinPart,
     QPainter *painter, const QRect &rect, SkinElementFlags flags)
@@ -1109,15 +1111,6 @@ void QS60Style::drawComplexControl(ComplexControl control, const QStyleOptionCom
         }
         break;
 #endif //QT_NO_GROUPBOX
-#ifndef QT_NO_DIAL
-    case CC_Dial:
-        if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
-            QStyleOptionSlider optionSlider = *slider;
-            QCommonStyle::drawComplexControl(control, &optionSlider, painter, widget);
-        }
-        break;
-#endif //QT_NO_DIAL
-
     default:
         QCommonStyle::drawComplexControl(control, option, painter, widget);
     }
@@ -1175,24 +1168,6 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                 QS60StylePrivate::drawSkinElement(skinElement, painter, option->rect, flags);
             }
         break;
-    case CE_PushButtonLabel:
-        if (const QStyleOptionButton *button = qstyleoption_cast<const QStyleOptionButton *>(option)) {
-            QStyleOptionButton optionButton = *button;
-            QCommonStyle::drawControl(element, &optionButton, painter, widget);
-        }
-        break;
-    case CE_CheckBoxLabel:
-        if (const QStyleOptionButton *checkBox = qstyleoption_cast<const QStyleOptionButton *>(option)) {
-            QStyleOptionButton optionCheckBox = *checkBox;
-            QCommonStyle::drawControl(element, &optionCheckBox, painter, widget);
-        }
-        break;
-    case CE_RadioButtonLabel:
-        if (const QStyleOptionButton *radioButton = qstyleoption_cast<const QStyleOptionButton *>(option)) {
-            QStyleOptionButton optionRadioButton = *radioButton;
-            QCommonStyle::drawControl(element, &optionRadioButton, painter, widget);
-        }
-        break;
 #ifndef QT_NO_TOOLBUTTON
     case CE_ToolButtonLabel:
         if (const QStyleOptionToolButton *toolBtn = qstyleoption_cast<const QStyleOptionToolButton *>(option)) {
@@ -1211,12 +1186,6 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
         }
         break;
 #endif //QT_NO_TOOLBUTTON
-    case CE_HeaderLabel:
-        if (const QStyleOptionHeader *headerLabel = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
-            QStyleOptionHeader optionHeaderLabel = *headerLabel;
-            QCommonStyle::drawControl(element, &optionHeaderLabel, painter, widget);
-        }
-        break;
 #ifndef QT_NO_COMBOBOX
     case CE_ComboBoxLabel:
         if (const QStyleOptionComboBox *comboBox = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
@@ -1578,12 +1547,6 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
         break;
 #endif // QT_NO_PROGRESSBAR
 #ifndef QT_NO_MENUBAR
-    case CE_MenuBarItem:
-        if (const QStyleOptionMenuItem *menuBarItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
-            QStyleOptionMenuItem optionMenuBarItem = *menuBarItem;
-            QCommonStyle::drawControl(element, &optionMenuBarItem, painter, widget);
-        }
-        break;
 #endif //QT_NO_MENUBAR
 #ifndef QT_NO_MENU
     case CE_MenuItem:
@@ -1796,49 +1759,6 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
         }
         break;
 #endif //QT_NO_TOOLBAR
-
-    //todo: remove non-used widgets in final version
-    case CE_ShapedFrame:
-    case CE_MenuVMargin:
-    case CE_MenuHMargin:
-#ifndef QT_NO_MENU
-    case CE_MenuScroller:
-    case CE_MenuTearoff:
-#endif //QT_NO_MENU
-
-    case CE_CheckBox:
-    case CE_RadioButton:
-#ifndef QT_NO_TABBAR
-    case CE_TabBarTab:
-#endif //QT_NO_TABBAR
-#ifndef QT_NO_PROGRESSBAR
-    case CE_ProgressBar:
-#endif // QT_NO_PROGRESSBAR
-    case CE_Q3DockWindowEmptyArea:
-#ifndef QT_NO_SIZEGRIP
-    case CE_SizeGrip:
-#endif //QT_NO_SIZEGRIP
-    case CE_Splitter:
-#ifndef QT_NO_RUBBERBAND
-    case CE_RubberBand:
-#endif //QT_NO_RUBBERBAND
-#ifndef QT_NO_DOCKWIDGET
-    case CE_DockWidgetTitle:
-#endif //QT_NO_DOCKWIDGET
-    case CE_ScrollBarAddLine:
-    case CE_ScrollBarSubLine:
-    case CE_ScrollBarAddPage:
-    case CE_ScrollBarSubPage:
-    case CE_ScrollBarSlider:
-    case CE_ScrollBarFirst:
-    case CE_ScrollBarLast:
-    case CE_FocusFrame:
-#ifndef QT_NO_TOOLBOX
-    case CE_ToolBoxTab:
-    case CE_ToolBoxTabShape:
-    case CE_ToolBoxTabLabel:
-#endif //QT_NO_TOOLBOX
-    case CE_ColumnViewGrip:
     default:
         QCommonStyle::drawControl(element, option, painter, widget);
     }
@@ -2167,15 +2087,6 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
 }
 
 /*!
-  \reimp - sets the default colors
-*/
-void QS60Style::drawItemText(QPainter *painter, const QRect &rectangle, int alignment, const QPalette & palette, bool enabled, const QString &text, QPalette::ColorRole textRole) const
-{
-    QPalette override = palette;
-    QCommonStyle::drawItemText(painter, rectangle, alignment, override, enabled, text, textRole);
-}
-
-/*!
   \reimp
 */
 int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
@@ -2185,7 +2096,6 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
         metricValue = QCommonStyle::pixelMetric(metric, option, widget);
 
     if (metric == PM_SubMenuOverlap && widget){
-        const int widgetWidth = widget->width();
         const QMenu *menu = qobject_cast<const QMenu *>(widget);
         if (menu && menu->activeAction() && menu->activeAction()->menu()) {
             const int menuWidth = menu->activeAction()->menu()->sizeHint().width();
@@ -2415,11 +2325,12 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
             ret = QCommonStyle::subControlRect(control, option, scontrol, widget);
             switch (scontrol) {
             case SC_GroupBoxCheckBox: //fallthrough
-            case SC_GroupBoxLabel:
+            case SC_GroupBoxLabel: {
                 //slightly indent text and boxes, so that dialog border does not mess with them.
                 const int horizontalSpacing =
                     QS60StylePrivate::pixelMetric(QStyle::PM_LayoutHorizontalSpacing);
                 ret.adjust(2,horizontalSpacing-3,0,0);
+                }
                 break;
             case SC_GroupBoxFrame: {
                 const QRect textBox = subControlRect(control, option, SC_GroupBoxLabel, widget);
@@ -2685,6 +2596,7 @@ void QS60Style::polish(QApplication *application)
 
 void QS60Style::unpolish(QApplication *application)
 {
+    Q_UNUSED(application)
     QPalette newPalette = qApp->style()->standardPalette();
     application->setPalette(newPalette);
     QApplicationPrivate::setSystemPalette(originalPalette);
@@ -2787,6 +2699,29 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
         QCommonStyle::standardIconImplementation(standardIcon, option, widget) : QIcon(cachedPixMap);
 }
 
+extern QPoint qt_s60_fill_background_offset(const QWidget *targetWidget);
+
+bool qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint &offset,
+            const QBrush &brush)
+{
+    const QPixmap backgroundTexture(QS60StylePrivate::backgroundTexture());
+    if (backgroundTexture.cacheKey() != brush.texture().cacheKey())
+        return false;
+
+    const QPaintDevice *target = painter->device();
+    if (target->devType() == QInternal::Widget) {
+		const QWidget *widget = static_cast<const QWidget *>(target);
+        const QRegion translated = rgn.translated(offset);
+        const QVector<QRect> &rects = translated.rects();
+        for (int i = 0; i < rects.size(); ++i) {
+            const QRect rect(rects.at(i));
+            painter->drawPixmap(rect.topLeft(), backgroundTexture,
+                                rect.translated(qt_s60_fill_background_offset(widget)));
+        }
+    }
+    return true;
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_STYLE_S60 || QT_PLUGIN
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h
index 945e182..09c6b00 100644
--- a/src/gui/styles/qs60style.h
+++ b/src/gui/styles/qs60style.h
@@ -36,7 +36,6 @@ public:
     void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = 0) const;
     void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
     void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const;
-    void drawItemText(QPainter *painter, const QRect &rectangle, int alignment, const QPalette &palette, bool enabled, const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const;
     int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w = 0) const;
     int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index bedff58..c93d271 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -366,8 +366,6 @@ public:
     static QColor lighterColor(const QColor &baseColor);
     //deduces if the given widget should have separately themeable background
     static bool drawsOwnThemeBackground(const QWidget *widget);
-    // gets layout
-    static const QHash<QStyle::PixelMetric, int> &s60StyleLayout();
 
     QFont s60Font(QS60StyleEnums::FontCategories fontCategory,
         int pointSize = -1) const;
@@ -388,7 +386,6 @@ public:
 
     static int focusRectPenWidth();
 
-#if defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
     static const layoutHeader m_layoutHeaders[];
     static const short data[][MAX_PIXELMETRICS];
 
@@ -398,7 +395,6 @@ public:
     static short const *m_pmPointer;
     // number of layouts supported by the style
     static const int m_numberOfLayouts;
-#endif // defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
 
     mutable QHash<QPair<QS60StyleEnums::FontCategories , int>, QFont> m_mappedFontsCache;
     mutable QHash<QS60StylePrivate::SkinFrameElements, QColor> m_colorCache;
diff --git a/src/gui/styles/qs60style_symbian.cpp b/src/gui/styles/qs60style_s60.cpp
index f860842..ddee4ba 100644
--- a/src/gui/styles/qs60style_symbian.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -593,30 +593,11 @@ bool QS60StylePrivate::isToolBarBackground()
     return (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1 || QSysInfo::s60Version() == QSysInfo::SV_S60_3_2);
 }
 
-void qt_s60_fill_background(QPainter *painter, const QRegion &rgn, const QPoint &offset,
-            const QBrush &brush)
+QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 {
-    const QPixmap backgroundTexture(QS60StylePrivate::backgroundTexture());
-    if (backgroundTexture.cacheKey() == brush.texture().cacheKey()) {
-        const QPaintDevice *target = painter->device();
-        if (target->devType() == QInternal::Widget) {
-            const QWidget *widget = static_cast<const QWidget *>(target);
-            CCoeControl *control = widget->effectiveWinId();
-            TPoint globalPos = control ? control->PositionRelativeToScreen() : TPoint(0,0);
-            const QRegion translated = rgn.translated(offset);
-            const QVector<QRect> &rects = translated.rects();
-            for (int i = 0; i < rects.size(); ++i) {
-                const QRect rect(rects.at(i));
-                painter->drawPixmap(rect.topLeft(), backgroundTexture,
-                                    rect.translated(globalPos.iX, globalPos.iY));
-            }
-        }
-    } else {
-        const QRegion translated = rgn.translated(offset);
-        const QRect rect(translated.boundingRect());
-        painter->setClipRegion(translated);
-        painter->drawTiledPixmap(rect, brush.texture(), rect.topLeft());
-    }
+    CCoeControl *control = targetWidget->effectiveWinId();
+    TPoint globalPos = control ? control->PositionRelativeToScreen() : TPoint(0,0);
+    return QPoint(globalPos.iX, globalPos.iY);
 }
 
 QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsL(
@@ -939,7 +920,6 @@ QFont QS60StylePrivate::s60Font_specific(
     return result;
 }
 
-#ifdef QT_S60STYLE_LAYOUTDATA_SIMULATED
 void QS60StylePrivate::setActiveLayout()
 {
     const QSize activeScreenSize(screenSize());
@@ -979,19 +959,11 @@ void QS60StylePrivate::setActiveLayout()
 
     m_pmPointer = data[activeLayoutIndex];
 }
-#endif // QT_S60STYLE_LAYOUTDATA_SIMULATED
 
 QS60StylePrivate::QS60StylePrivate()
 {
-#ifdef QT_S60STYLE_LAYOUTDATA_SIMULATED
     // No need to set active layout, if dynamic metrics API is available
     setActiveLayout();
-#endif // QT_S60STYLE_LAYOUTDATA_SIMULATED
-}
-
-QS60StylePrivate::~QS60StylePrivate()
-{
-    deleteBackground();
 }
 
 void QS60StylePrivate::setStyleProperty_specific(const char *name, const QVariant &value)
@@ -1011,20 +983,6 @@ QVariant QS60StylePrivate::styleProperty_specific(const char *name) const
         return styleProperty(name);
 }
 
-short QS60StylePrivate::pixelMetric(int metric)
-{
-#ifdef QT_S60STYLE_LAYOUTDATA_SIMULATED
-    Q_ASSERT(metric < MAX_PIXELMETRICS);
-    const short returnValue = m_pmPointer[metric];
-    if (returnValue==-909)
-        return -1;
-    return returnValue;
-#else
-    //todo - call the pixelmetrics API directly
-    return 0;
-#endif // QT_S60STYLE_LAYOUTDATA_SIMULATED
-}
-
 QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list,
     int index, const QStyleOption *option)
 {
@@ -1343,9 +1301,7 @@ void QS60Style::handleDynamicLayoutVariantSwitch()
 {
     Q_D(QS60Style);
     d->clearCaches(QS60StylePrivate::CC_LayoutChange);
-#ifdef QT_S60STYLE_LAYOUTDATA_SIMULATED
     d->setActiveLayout();
-#endif // QT_S60STYLE_LAYOUTDATA_SIMULATED
     d->refreshUI();
     d->setBackgroundTexture(qApp);
     foreach (QWidget *widget, QApplication::allWidgets())
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp
index 3edc874..b6ad0ac 100644
--- a/src/gui/styles/qs60style_simulated.cpp
+++ b/src/gui/styles/qs60style_simulated.cpp
@@ -42,19 +42,6 @@ QS60StylePrivate::QS60StylePrivate()
     setCurrentLayout(0);
 }
 
-QS60StylePrivate::~QS60StylePrivate()
-{
-}
-
-short QS60StylePrivate::pixelMetric(int metric)
-{
-    Q_ASSERT(metric < MAX_PIXELMETRICS);
-    const short returnValue = m_pmPointer[metric];
-    if (returnValue==-909)
-        return -1;
-    return returnValue;
-}
-
 QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list,
     int index, const QStyleOption *option)
 {
@@ -194,7 +181,7 @@ QVariant QS60StylePrivate::styleProperty_specific(const char *name) const
 QPixmap QS60StylePrivate::backgroundTexture()
 {
     if (!m_background) {
-        const QSize size = QApplication::activeWindow()?QApplication::activeWindow()->size():QSize(100, 100);
+        const QSize size = QApplication::desktop()->screen()->size();
         QPixmap background = part(QS60StyleEnums::SP_QsnBgScreen, size);
         m_background = new QPixmap(background);
     }
@@ -216,7 +203,6 @@ bool QS60StylePrivate::isToolBarBackground()
     return true;
 }
 
-
 QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize)
 {
     QFont result;
@@ -281,6 +267,13 @@ void QS60Style::setS60Theme(const QHash<QString, QPicture> &parts,
     QS60StyleModeSpecifics::m_partPictures = parts;
     QS60StyleModeSpecifics::m_colors = colors;
     d->clearCaches(QS60StylePrivate::CC_ThemeChange);
+    d->setBackgroundTexture(qApp);
+}
+
+QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
+{
+	Q_UNUSED(targetWidget)
+    return QPoint();
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 9aa170e..050d81d 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -160,9 +160,8 @@ contains( styles, s60 ) {
 		styles/qs60style.h \
 		styles/qs60style_p.h
 	SOURCES += styles/qs60style.cpp
-	DEFINES += QT_S60STYLE_LAYOUTDATA_SIMULATED
 	symbian {
-		SOURCES += styles/qs60style_symbian.cpp
+		SOURCES += styles/qs60style_s60.cpp
 		# TODO: fix the following LIBS hack. Line 1 is for armv5, 2 for winscw
 		LIBS += aknicon aknskins aknskinsrv fontutils
 		LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index 347f89a..2bf1cda 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -659,7 +659,6 @@ void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit)
         d->edit->setParent(this);
 
     d->edit->setFrame(false);
-    d->edit->setAttribute(Qt::WA_InputMethodEnabled, false);
     d->edit->setFocusProxy(this);
     d->edit->setAcceptDrops(false);
 
@@ -690,6 +689,18 @@ void QAbstractSpinBox::interpretText()
     d->interpret(EmitIfChanged);
 }
 
+/*
+    Reimplemented in 4.6, so be careful.
+ */
+/*!
+    \reimp
+*/
+QVariant QAbstractSpinBox::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    Q_D(const QAbstractSpinBox);
+    return d->edit->inputMethodQuery(query);
+}
+
 /*!
     \reimp
 */
diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h
index 4e7fc3f..aa8905f 100644
--- a/src/gui/widgets/qabstractspinbox.h
+++ b/src/gui/widgets/qabstractspinbox.h
@@ -122,6 +122,8 @@ public:
     void interpretText();
     bool event(QEvent *event);
 
+    QVariant inputMethodQuery(Qt::InputMethodQuery) const;
+
     virtual QValidator::State validate(QString &input, int &pos) const;
     virtual void fixup(QString &input) const;
 
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 83bec68..4d34691 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -2390,6 +2390,7 @@ void QDateTimeEditPrivate::init(const QVariant &var)
         q->setCalendarPopup(true);
 #endif
     updateTimeSpec();
+    q->setInputMethodHints(Qt::ImhPreferNumbers);
     setLayoutItemMargins(QStyle::SE_DateTimeEditLayoutItem);
 }
 
diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp
index c691eaf..295bf48 100644
--- a/src/gui/widgets/qspinbox.cpp
+++ b/src/gui/widgets/qspinbox.cpp
@@ -77,6 +77,8 @@ public:
     QChar thousand;
 
     inline void init() {
+        Q_Q(QSpinBox);
+        q->setInputMethodHints(Qt::ImhDigitsOnly);
         setLayoutItemMargins(QStyle::SE_SpinBoxLayoutItem);
     }
 };
@@ -97,6 +99,11 @@ public:
     // variables
     int decimals;
     QChar delimiter, thousand;
+
+    inline void init() {
+        Q_Q(QDoubleSpinBox);
+        q->setInputMethodHints(Qt::ImhFormattedNumbersOnly);
+    }
 };
 
 
@@ -592,6 +599,8 @@ void QSpinBox::fixup(QString &input) const
 QDoubleSpinBox::QDoubleSpinBox(QWidget *parent)
     : QAbstractSpinBox(*new QDoubleSpinBoxPrivate(parent), parent)
 {
+    Q_D(QDoubleSpinBox);
+    d->init();
 }
 
 /*!
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 6ea38f7..15319ce 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -226,10 +226,17 @@ int main(int argc, char *argv[]) \
 
 #include <QtTest/qtest_gui.h>
 
+#ifdef QT_KEYPAD_NAVIGATION
+#  define QTEST_DISABLE_KEYPAD_NAVIGATION QApplication::setKeypadNavigationEnabled(false);
+#else
+#  define QTEST_DISABLE_KEYPAD_NAVIGATION
+#endif
+
 #define QTEST_MAIN(TestObject) \
 int main(int argc, char *argv[]) \
 { \
     QApplication app(argc, argv); \
+    QTEST_DISABLE_KEYPAD_NAVIGATION \
     TestObject tc; \
     return QTest::qExec(&tc, argc, argv); \
 }
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 27ba6da..b676012 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -300,10 +300,15 @@ QT_BEGIN_NAMESPACE
     the \a TestClass, and executes all tests in the order they were defined.
     Use this macro to build stand-alone executables.
 
+    \bold {Note:} On platforms that have keypad navigation enabled by default (eg: Symbian),
+    this macro will forcfully disable it to simplify the usage of key events when writing
+    autotests. If you wish to write a test case that uses keypad navigation, you should
+    enable it either in the \c {initTestCase()} or \c {init()} functions of your test case.
+
     Example:
     \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 11
 
-    \sa QTEST_APPLESS_MAIN(), QTest::qExec()
+    \sa QTEST_APPLESS_MAIN(), QTest::qExec(), QApplication::setKeypadNavigationEnabled()
 */
 
 /*! \macro QTEST_APPLESS_MAIN(TestClass)