Merge branch 'master' into animation-refactor

Conflicts:
	tools/qmlviewer/qdeclarativetester.cpp
	tools/qmlviewer/qmlruntime.cpp

Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa

4 files changed, 13 insertions, 4 deletions

diff --git a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
index 58bd09b280..a1fe5ff508 100644
--- a/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -1157,7 +1157,7 @@ QString QDeclarative1VisualDataModel::stringValue(int index, const QString &name
 
     QDeclarativeData *ddata = QDeclarativeData::get(data);
     if (ddata && ddata->propertyCache) {
-        QDeclarativePropertyCache::Data *prop = ddata->propertyCache->property(name);
+        QDeclarativePropertyData *prop = ddata->propertyCache->property(name);
         if (prop) {
             if (prop->propType == QVariant::String) {
                 void *args[] = { &val, 0 };
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index 65010fecb8..e06914f5ee 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -18,6 +18,8 @@ feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
 feature.files = $$PWD/features/qtquick1.prf
 INSTALLS += feature
 
+win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
+
 symbian {
     DEFINES += QT_MAKEDLL
     CONFIG += epocallowdlldata
diff --git a/src/qtquick1/util/qdeclarativepixmapcache.cpp b/src/qtquick1/util/qdeclarativepixmapcache.cpp
index 0b2e16c2ff..f4420cb3af 100644
--- a/src/qtquick1/util/qdeclarativepixmapcache.cpp
+++ b/src/qtquick1/util/qdeclarativepixmapcache.cpp
@@ -602,7 +602,8 @@ private:
     int m_unreferencedCost;
     int m_timerId;
 };
-Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore);
+
+Q_GLOBAL_STATIC(QDeclarative1PixmapStore, pixmapStore)
 
 QDeclarative1PixmapStore::QDeclarative1PixmapStore()
 : m_unreferencedPixmaps(0), m_lastUnreferencedPixmap(0), m_unreferencedCost(0), m_timerId(-1)
@@ -790,6 +791,7 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
                     return new QDeclarative1PixmapData(url, QPixmap::fromImage(image), readSize, requestSize);
                 }
             }
+            break;
             case QDeclarativeImageProvider::Pixmap:
             {
                 QPixmap pixmap = ep->getPixmapFromProvider(url, &readSize, requestSize);
@@ -798,6 +800,10 @@ static QDeclarative1PixmapData* createPixmapDataSync(QDeclarativeEngine *engine,
                     return new QDeclarative1PixmapData(url, pixmap, readSize, requestSize);
                 }
             }
+            break;
+        case QDeclarativeImageProvider::Texture:
+        case QDeclarativeImageProvider::Invalid:
+            break;
         }
 
         // no matching provider, or provider has bad image type, or provider returned null image
diff --git a/src/qtquick1/util/qdeclarativepropertychanges.cpp b/src/qtquick1/util/qdeclarativepropertychanges.cpp
index 692d7bbb60..3ea22e83fc 100644
--- a/src/qtquick1/util/qdeclarativepropertychanges.cpp
+++ b/src/qtquick1/util/qdeclarativepropertychanges.cpp
@@ -174,7 +174,8 @@ public:
         reverseExpression = rewindExpression;
     }
 
-    /*virtual void copyOriginals(QDeclarative1ActionEvent *other)
+    virtual bool needsCopy() { return true; }
+    virtual void copyOriginals(QDeclarative1ActionEvent *other)
     {
         QDeclarative1ReplaceSignalHandler *rsh = static_cast<QDeclarative1ReplaceSignalHandler*>(other);
         saveCurrentValues();
@@ -185,7 +186,7 @@ public:
             ownedExpression = rsh->ownedExpression;
             rsh->ownedExpression = 0;
         }
-    }*/
+    }
 
     virtual void rewind() {
         ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression);