Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 19 insertions, 8 deletions

diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index d11e3cb..5a7e94c 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -71,7 +71,7 @@ public:
         str_forwardOnly = engine->toStringHandle(QLatin1String("forwardOnly")); // not in HTML5 (an optimization)
     }
 
-    QueryFlags queryProperty(const QScriptValue &object,
+    QueryFlags queryProperty(const QScriptValue &,
                              const QScriptString &name,
                              QueryFlags flags, uint *)
     {
@@ -369,7 +369,7 @@ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEng
                     // Incompatible
                     THROW_SQL(VERSION_ERR,QmlEngine::tr("SQL: database version mismatch"));
                 }
-                version = ini.value("Version").toString();
+                version = ini.value(QLatin1String("Version")).toString();
             }
             database.setDatabaseName(basename+QLatin1String(".sqlite"));
         }
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h
index cb1c642..326e1c6 100644
--- a/src/declarative/util/qmlanimation_p_p.h
+++ b/src/declarative/util/qmlanimation_p_p.h
@@ -64,6 +64,7 @@
 #include <qml.h>
 #include <qmlcontext.h>
 #include <private/qmltimeline_p_p.h>
+#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -94,9 +95,9 @@ class QActionAnimation : public QAbstractAnimation
 {
     Q_OBJECT
 public:
-    QActionAnimation(QObject *parent = 0) : QAbstractAnimation(parent), animAction(0), policy(KeepWhenStopped) {}
+    QActionAnimation(QObject *parent = 0) : QAbstractAnimation(parent), animAction(0), policy(KeepWhenStopped), running(false) {}
     QActionAnimation(QAbstractAnimationAction *action, QObject *parent = 0)
-        : QAbstractAnimation(parent), animAction(action), policy(KeepWhenStopped) {}
+        : QAbstractAnimation(parent), animAction(action), policy(KeepWhenStopped), running(false) {}
     virtual int duration() const { return 0; }
     void setAnimAction(QAbstractAnimationAction *action, DeletionPolicy p)
     {
@@ -111,17 +112,27 @@ protected:
     virtual void updateState(State newState, State /*oldState*/)
     {
         if (newState == Running) {
-            if (animAction)
+            if (animAction) {
+                running = true;
                 animAction->doAction();
+                running = false;
+                if (state() == Stopped && policy == DeleteWhenStopped) {
+                    delete animAction;
+                    animAction = 0;
+                }
+            }
         } else if (newState == Stopped && policy == DeleteWhenStopped) {
-            delete animAction;
-            animAction = 0;
+            if (!running) {
+                delete animAction;
+                animAction = 0;
+            }
         }
     }
 
 private:
     QAbstractAnimationAction *animAction;
     DeletionPolicy policy;
+    bool running;
 };
 
 //animates QmlTimeLineValue (assumes start and end values will be reals or compatible)
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index fc1863f..443c9c5 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5918,7 +5918,7 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen)
     if (QPixmapCache::find(key, pixmap))
         return pixmap;
 
-    const qreal halfPeriod = qMax(qreal(2), radiusBase * 1.61803399); // the golden ratio
+    const qreal halfPeriod = qMax(qreal(2), qreal(radiusBase * 1.61803399)); // the golden ratio
     const int width = qCeil(100 / (2 * halfPeriod)) * (2 * halfPeriod);
     const int radius = qFloor(radiusBase);