Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Converting accidental use of doubles to qreal in declarative
  Copy and Cut are not available for some QML editors
  Ignore CcpuCan calls if input context is being destroyed

10 files changed, 77 insertions, 56 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 70fc702..4dcf17c 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -228,9 +228,9 @@ void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
         if (current == QDeclarativeFlipable::Back && back)
             setBackTransform();
         if (front)
-            front->setOpacity((current==QDeclarativeFlipable::Front)?1.:0.);
+            front->setOpacity((current==QDeclarativeFlipable::Front)?qreal(1.):qreal(0.));
         if (back)
-            back->setOpacity((current==QDeclarativeFlipable::Back)?1.:0.);
+            back->setOpacity((current==QDeclarativeFlipable::Back)?qreal(1.):qreal(0.));
         emit q->sideChanged();
     }
 }
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 023737d..a7d593a 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1212,10 +1212,10 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
         }
         qreal accel = deceleration;
         qreal v2 = v * v;
-        qreal overshootDist = 0.0;
-        if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QDeclarativeGridView::SnapOneRow) {
+        qreal overshootDist = qreal(0.0);
+        if ((maxDistance > qreal(0.0) && v2 / (2.0f * maxDistance) < accel) || snapMode == QDeclarativeGridView::SnapOneRow) {
             // + rowSize()/4 to encourage moving at least one item in the flick direction
-            qreal dist = v2 / (accel * 2.0) + rowSize()/4;
+            qreal dist = v2 / (accel * qreal(2.0)) + rowSize()/4;
             dist = qMin(dist, maxDistance);
             if (v > 0)
                 dist = -dist;
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 6a91e5f..44d6a1a 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1457,14 +1457,14 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
             // the initial flick - estimate boundary
             qreal accel = deceleration;
             qreal v2 = v * v;
-            overshootDist = 0.0;
+            overshootDist = qreal(0.0);
             // + averageSize/4 to encourage moving at least one item in the flick direction
-            qreal dist = v2 / (accel * 2.0) + averageSize/4;
+            qreal dist = v2 / (accel * qreal(2.0)) + averageSize/4;
             if (maxDistance > 0)
                 dist = qMin(dist, maxDistance);
             if (v > 0)
                 dist = -dist;
-            if ((maxDistance > 0.0 && v2 / (2.0f * maxDistance) < accel) || snapMode == QDeclarativeListView::SnapOneItem) {
+            if ((maxDistance > qreal(0.0) && v2 / (2.0f * maxDistance) < accel) || snapMode == QDeclarativeListView::SnapOneItem) {
                 if (snapMode != QDeclarativeListView::SnapOneItem) {
                     qreal distTemp = isRightToLeft() ? -dist : dist;
                     data.flickTarget = -snapPosAt(-(dataValue - highlightStart) + distTemp) + highlightStart;
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 94f128d..ecd8982 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -246,7 +246,7 @@ void QDeclarativePathViewPrivate::updateHighlight()
         } else {
             qreal target = currentIndex;
 
-            offsetAdj = 0.0;
+            offsetAdj = qreal(0.0);
             tl.reset(moveHighlight);
             moveHighlight.setValue(highlightPosition);
 
@@ -255,14 +255,14 @@ void QDeclarativePathViewPrivate::updateHighlight()
             if (target - highlightPosition > modelCount/2) {
                 highlightUp = false;
                 qreal distance = modelCount - target + highlightPosition;
-                tl.move(moveHighlight, 0.0, QEasingCurve(QEasingCurve::InQuad), int(duration * highlightPosition / distance));
-                tl.set(moveHighlight, modelCount-0.01);
+                tl.move(moveHighlight, qreal(0.0), QEasingCurve(QEasingCurve::InQuad), int(duration * highlightPosition / distance));
+                tl.set(moveHighlight, modelCount-qreal(0.01));
                 tl.move(moveHighlight, target, QEasingCurve(QEasingCurve::OutQuad), int(duration * (modelCount-target) / distance));
             } else if (target - highlightPosition <= -modelCount/2) {
                 highlightUp = true;
                 qreal distance = modelCount - highlightPosition + target;
-                tl.move(moveHighlight, modelCount-0.01, QEasingCurve(QEasingCurve::InQuad), int(duration * (modelCount-highlightPosition) / distance));
-                tl.set(moveHighlight, 0.0);
+                tl.move(moveHighlight, modelCount-qreal(0.01), QEasingCurve(QEasingCurve::InQuad), int(duration * (modelCount-highlightPosition) / distance));
+                tl.set(moveHighlight, qreal(0.0));
                 tl.move(moveHighlight, target, QEasingCurve(QEasingCurve::OutQuad), int(duration * target / distance));
             } else {
                 highlightUp = highlightPosition - target < 0;
@@ -287,18 +287,18 @@ void QDeclarativePathViewPrivate::setHighlightPosition(qreal pos)
         qreal relativeHighlight = qmlMod(pos + offset, range) / range;
 
         if (!highlightUp && relativeHighlight > end * mappedRange) {
-            qreal diff = 1.0 - relativeHighlight;
+            qreal diff = qreal(1.0) - relativeHighlight;
             setOffset(offset + diff * range);
         } else if (highlightUp && relativeHighlight >= (end - start) * mappedRange) {
             qreal diff = relativeHighlight - (end - start) * mappedRange;
-            setOffset(offset - diff * range - 0.00001);
+            setOffset(offset - diff * range - qreal(0.00001));
         }
 
         highlightPosition = pos;
         qreal pathPos = positionOfIndex(pos);
         updateItem(highlightItem, pathPos);
         if (QDeclarativePathViewAttached *att = attached(highlightItem))
-            att->setOnPath(pathPos != -1.0);
+            att->setOnPath(pathPos != qreal(-1.0));
     }
 }
 
@@ -1200,7 +1200,7 @@ void QDeclarativePathViewPrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEve
 
     qreal elapsed = qreal(lastElapsed + QDeclarativeItemPrivate::elapsed(lastPosTime)) / 1000.;
     qreal velocity = elapsed > 0. ? lastDist / elapsed : 0;
-    if (model && modelCount && qAbs(velocity) > 1.) {
+    if (model && modelCount && qAbs(velocity) > qreal(1.)) {
         qreal count = pathItems == -1 ? modelCount : pathItems;
         if (qAbs(velocity) > count * 2) // limit velocity
             velocity = (velocity > 0 ? count : -count) * 2;
@@ -1208,7 +1208,7 @@ void QDeclarativePathViewPrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEve
         qreal v2 = velocity*velocity;
         qreal accel = deceleration/10;
         // + 0.25 to encourage moving at least one item in the flick direction
-        qreal dist = qMin(qreal(modelCount-1), qreal(v2 / (accel * 2.0) + 0.25));
+        qreal dist = qMin(qreal(modelCount-1), qreal(v2 / (accel * qreal(2.0)) + qreal(0.25)));
         if (haveHighlightRange && highlightRangeMode == QDeclarativePathView::StrictlyEnforceRange) {
             // round to nearest item.
             if (velocity > 0.)
@@ -1217,13 +1217,13 @@ void QDeclarativePathViewPrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEve
                 dist = qRound(dist - offset) + offset;
             // Calculate accel required to stop on item boundary
             if (dist <= 0.) {
-                dist = 0.;
-                accel = 0.;
+                dist = qreal(0.);
+                accel = qreal(0.);
             } else {
                 accel = v2 / (2.0f * qAbs(dist));
             }
         }
-        offsetAdj = 0.0;
+        offsetAdj = qreal(0.0);
         moveOffset.setValue(offset);
         tl.accel(moveOffset, velocity, accel, dist);
         tl.callback(QDeclarativeTimeLineCallback(&moveOffset, fixOffsetCallback, this));
@@ -1588,7 +1588,7 @@ void QDeclarativePathView::createdItem(int index, QDeclarativeItem *item)
             att->setOnPath(false);
         }
         item->setParentItem(this);
-        d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
+        d->updateItem(item, index < d->firstIndex ? qreal(0.0) : qreal(1.0));
     }
 }
 
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index ce21bcd..455c4f6 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2719,7 +2719,7 @@ void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                     }
 
                     if (scale != 0)
-                        rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
+                        rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
                     else {
                         qmlInfo(this) << QDeclarativeParentAnimation::tr("Unable to preserve appearance under scale of 0");
                         ok = false;
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index b77db89..e905d0a 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -51,7 +51,7 @@
 
 #include <QtCore/qdebug.h>
 
-#include <math.h>
+#include <QtCore/qmath.h>
 
 #define DELAY_STOP_TIMER_INTERVAL 32
 
@@ -98,20 +98,20 @@ bool QSmoothedAnimation::recalc()
     s = to - initialValue;
     vi = initialVelocity;
 
-    s = (invert? -1.0: 1.0) * s;
+    s = (invert? qreal(-1.0): qreal(1.0)) * s;
 
     if (userDuration > 0 && velocity > 0) {
         tf = s / velocity;
-        if (tf > (userDuration / 1000.)) tf = (userDuration / 1000.);
+        if (tf > (userDuration / qreal(1000.))) tf = (userDuration / qreal(1000.));
     } else if (userDuration > 0) {
-        tf = userDuration / 1000.;
+        tf = userDuration / qreal(1000.);
     } else if (velocity > 0) {
         tf = s / velocity;
     } else {
         return false;
     }
 
-    finalDuration = ceil(tf * 1000.0);
+    finalDuration = ceil(tf * qreal(1000.0));
 
     if (maximumEasingTime == 0) {
         a = 0;
@@ -121,33 +121,33 @@ bool QSmoothedAnimation::recalc()
         vp = velocity;
         sp = 0;
         sd = s;
-    } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / 1000.)) {
-        qreal met = maximumEasingTime / 1000.;
+    } else if (maximumEasingTime != -1 && tf > (maximumEasingTime / qreal(1000.))) {
+        qreal met = maximumEasingTime / qreal(1000.);
         td = tf - met;
 
         qreal c1 = td;
         qreal c2 = (tf - td) * vi - tf * velocity;
-        qreal c3 = -0.5 * (tf - td) * vi * vi;
+        qreal c3 = qreal(-0.5) * (tf - td) * vi * vi;
 
-        qreal vp1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+        qreal vp1 = (-c2 + qSqrt(c2 * c2 - 4 * c1 * c3)) / (qreal(2.) * c1);
 
         vp = vp1;
         a = vp / met;
         d = a;
         tp = (vp - vi) / a;
-        sp = vi * tp + 0.5 * a * tp * tp;
+        sp = vi * tp + qreal(0.5) * a * tp * tp;
         sd = sp + (td - tp) * vp;
     } else {
-        qreal c1 = 0.25 * tf * tf;
-        qreal c2 = 0.5 * vi * tf - s;
-        qreal c3 = -0.25 * vi * vi;
+        qreal c1 = qreal(0.25) * tf * tf;
+        qreal c2 = qreal(0.5) * vi * tf - s;
+        qreal c3 = qreal(-0.25) * vi * vi;
 
-        qreal a1 = (-c2 + sqrt(c2 * c2 - 4 * c1 * c3)) / (2. * c1);
+        qreal a1 = (-c2 + qSqrt(c2 * c2 - 4 * c1 * c3)) / (qreal(2.) * c1);
 
-        qreal tp1 = 0.5 * tf - 0.5 * vi / a1;
+        qreal tp1 = qreal(0.5) * tf - qreal(0.5) * vi / a1;
         qreal vp1 = a1 * tp1 + vi;
 
-        qreal sp1 = 0.5 * a1 * tp1 * tp1 + vi * tp1;
+        qreal sp1 = qreal(0.5) * a1 * tp1 * tp1 + vi * tp1;
 
         a = a1;
         d = a1;
@@ -165,7 +165,7 @@ qreal QSmoothedAnimation::easeFollow(qreal time_seconds)
     qreal value;
     if (time_seconds < tp) {
         trackVelocity = vi + time_seconds * a;
-        value = 0.5 * a * time_seconds * time_seconds + vi * time_seconds;
+        value = qreal(0.5) * a * time_seconds * time_seconds + vi * time_seconds;
     } else if (time_seconds < td) {
         time_seconds -= tp;
         trackVelocity = vp;
@@ -173,7 +173,7 @@ qreal QSmoothedAnimation::easeFollow(qreal time_seconds)
     } else if (time_seconds < tf) {
         time_seconds -= td;
         trackVelocity = vp - time_seconds * a;
-        value = sd - 0.5 * d * time_seconds * time_seconds + vp * time_seconds;
+        value = sd - qreal(0.5) * d * time_seconds * time_seconds + vp * time_seconds;
     } else {
         trackVelocity = 0;
         value = s;
@@ -186,10 +186,10 @@ qreal QSmoothedAnimation::easeFollow(qreal time_seconds)
 
 void QSmoothedAnimation::updateCurrentTime(int t)
 {
-    qreal time_seconds = qreal(t - lastTime) / 1000.;
+    qreal time_seconds = qreal(t - lastTime) / qreal(1000.);
 
     qreal value = easeFollow(time_seconds);
-    value *= (invert? -1.0: 1.0);
+    value *= (invert? qreal(-1.0): qreal(1.0));
     QDeclarativePropertyPrivate::write(target, initialValue + value,
                                        QDeclarativePropertyPrivate::BypassInterceptor
                                        | QDeclarativePropertyPrivate::DontRemoveBinding);
@@ -213,7 +213,7 @@ void QSmoothedAnimation::init()
         return;
     }
 
-    bool hasReversed = trackVelocity != 0. &&
+    bool hasReversed = trackVelocity != qreal(0.) &&
                       ((!invert) == ((initialValue - to) > 0));
 
     if (hasReversed) {
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index 2c6058c..0b453ee 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -161,17 +161,17 @@ bool QDeclarativeSpringAnimationPrivate::animate(const QDeclarativeProperty &pro
                 animation.velocity = animation.velocity + (spring * diff - damping * animation.velocity) / mass;
             else
                 animation.velocity = animation.velocity + spring * diff - damping * animation.velocity;
-            if (maxVelocity > 0.) {
+            if (maxVelocity > qreal(0.)) {
                 // limit velocity
                 if (animation.velocity > maxVelocity)
                     animation.velocity = maxVelocity;
                 else if (animation.velocity < -maxVelocity)
                     animation.velocity = -maxVelocity;
             }
-            animation.currentValue += animation.velocity * 16.0 / 1000.0;
+            animation.currentValue += animation.velocity * qreal(16.0) / qreal(1000.0);
             if (haveModulus) {
                 animation.currentValue = fmod(animation.currentValue, modulus);
-                if (animation.currentValue < 0.0)
+                if (animation.currentValue < qreal(0.0))
                     animation.currentValue += modulus;
             }
         }
@@ -195,7 +195,7 @@ bool QDeclarativeSpringAnimationPrivate::animate(const QDeclarativeProperty &pro
                 animation.currentValue = fmod(animation.currentValue, modulus);
         } else {
             animation.currentValue -= moveBy;
-            if (haveModulus && animation.currentValue < 0.0)
+            if (haveModulus && animation.currentValue < qreal(0.0))
                 animation.currentValue = fmod(animation.currentValue, modulus) + modulus;
         }
         if (lastTime - animation.start >= animation.duration) {
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index c260684..8f613b0 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -123,7 +123,7 @@ void QDeclarativeParentChangePrivate::doChange(QDeclarativeItem *targetParent, Q
             }
 
             if (scale != 0)
-                rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/M_PI;
+                rotation = atan2(transform.m12()/scale, transform.m11()/scale) * 180/qreal(M_PI);
             else {
                 qmlInfo(q) << QDeclarativeParentChange::tr("Unable to preserve appearance under scale of 0");
                 ok = false;
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 658dcad..980568e 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -530,7 +530,7 @@ public:
 
     void notifyQueryStarted(bool remoteSource) {
         Q_Q(QDeclarativeXmlListModel);
-        progress = remoteSource ? 0.0 : 1.0;
+        progress = remoteSource ? qreal(0.0) : qreal(1.0);
         status = QDeclarativeXmlListModel::Loading;
         errorString.clear();
         emit q->progressChanged(progress);
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index f18d32c..8f13c53 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -1744,15 +1744,33 @@ TBool QCoeFepInputContext::CcpuIsFocused() const
 TBool QCoeFepInputContext::CcpuCanCut() const
 {
     bool retval = false;
+    if (m_inDestruction)
+        return retval;
     QWidget *w = focusWidget();
-    if (!w)
+    QObject *focusObject = 0;
+    if (!w) {
         w = m_lastFocusedEditor;
-    else
-        w = getQWidgetFromQGraphicsView(w);
+        focusObject = m_lastFocusedObject;
+    } else {
+        w = getQWidgetFromQGraphicsView(w, &focusObject);
+    }
     if (w) {
-        int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
-        int anchor = w->inputMethodQuery(Qt::ImAnchorPosition).toInt();
-        retval = cursor != anchor;
+        QRect microFocus = w->inputMethodQuery(Qt::ImMicroFocus).toRect();
+        if (microFocus.isNull()) {
+            // For some reason, the editor does not have microfocus. Most probably,
+            // it is due to using native fullscreen editing mode with QML apps.
+            // Try accessing "selectedText" directly.
+            QObject *invokeTarget = w;
+            if (focusObject)
+                invokeTarget = focusObject;
+
+            QString selectedText = invokeTarget->property("selectedText").toString();
+            retval = !selectedText.isNull();
+        } else {
+            int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
+            int anchor = w->inputMethodQuery(Qt::ImAnchorPosition).toInt();
+            retval = cursor != anchor;
+        }
     }
     return retval;
 }
@@ -1775,6 +1793,9 @@ void QCoeFepInputContext::CcpuCopyL()
 TBool QCoeFepInputContext::CcpuCanPaste() const
 {
     bool canPaste = false;
+    if (m_inDestruction)
+        return canPaste;
+
     QString textToPaste = QApplication::clipboard()->text();
     if (!textToPaste.isEmpty()) {
         QWidget *w = focusWidget();