3 files changed, 19 insertions, 2 deletions
diff --git a/src/gui/widgets/qabstractslider_p.h b/src/gui/widgets/qabstractslider_p.h
index 19d1fca..d044131 100644
--- a/src/gui/widgets/qabstractslider_p.h
+++ b/src/gui/widgets/qabstractslider_p.h
@@ -117,7 +117,7 @@ public:
         ;
     }
 
-    inline int bound(int val) const { return qMax(minimum, qMin(maximum, val)); }
+    virtual int bound(int val) const { return qMax(minimum, qMin(maximum, val)); }
     inline int overflowSafeAdd(int add) const
     {
         int newValue = value + add;
diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp
index a8d739f..bca5019 100644
--- a/src/gui/widgets/qdial.cpp
+++ b/src/gui/widgets/qdial.cpp
@@ -83,6 +83,7 @@ public:
     int valueFromPoint(const QPoint &) const;
     double angle(const QPoint &, const QPoint &) const;
     void init();
+    virtual int bound(int val) const;
 };
 
 void QDialPrivate::init()
@@ -97,6 +98,20 @@ void QDialPrivate::init()
 #endif
 }
 
+int QDialPrivate::bound(int val) const
+{
+    if (wrapping) {
+        if ((val >= minimum) && (val <= maximum))
+            return val;
+        val = minimum + ((val - minimum) % (maximum - minimum));
+        if (val < minimum)
+            val += maximum - minimum;
+        return val;
+    } else {
+        return QAbstractSliderPrivate::bound(val);
+    }
+}
+
 /*!
     Initialize \a option with the values from this QDial. This method
     is useful for subclasses when they need a QStyleOptionSlider, but don't want
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 69abcad..1fcbd73 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1744,7 +1744,9 @@ QVariant QScriptEnginePrivate::toVariant(JSC::ExecState *exec, JSC::JSValue valu
         else if (QScriptDeclarativeClass *dc = declarativeClass(value))
             return dc->toVariant(declarativeObject(value));
         return variantMapFromObject(exec, JSC::asObject(value));
-    } else if (value.isNumber()) {
+    } else if (value.isInt32()) {
+        return QVariant(toInt32(exec, value));
+    } else if (value.isDouble()) {
         return QVariant(toNumber(exec, value));
     } else if (value.isString()) {
         return QVariant(toString(exec, value));