Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 files changed, 270 insertions, 2 deletions

diff --git a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 0821cea..d71834e 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -30,7 +30,12 @@ Component {
 
             VisualDataModel {
                 id: visualModel; delegate: PhotoDelegate { }
-                model: RssModel { tags: tag }
+                model: RssModel { id: rssModel; tags: tag }
+            }
+
+            BusyIndicator {
+                anchors { centerIn: parent; verticalCenterOffset: -20 }
+                on: rssModel.status != XmlListModel.Ready
             }
 
             PathView {
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
new file mode 100644
index 0000000..919ac43
--- /dev/null
+++ b/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+Image {
+    id: container
+    property bool on: false
+
+    source: "images/busy.png"; visible: container.on
+    NumberAnimation on rotation { running: container.on; from: 0; to: 360; repeat: true; duration: 1200 }
+}
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 5a4e63e..89fe3e8 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -32,7 +32,7 @@ Package {
                 property int h: getHeight(content)
                 property double s: calculateScale(w, h, photoWrapper.width)
 
-                color: '#898989'; anchors.centerIn: parent; smooth: true; border.color: 'white'; border.width: 3
+                color: '#878787'; anchors.centerIn: parent; smooth: true; border.color: 'white'; border.width: 3
                 width:  w * s; height: h * s; visible: originalImage.status != Image.Ready
             }
             Rectangle {
@@ -40,6 +40,7 @@ Package {
                 width: originalImage.paintedWidth + 6; height: originalImage.paintedHeight + 6
                 visible: !placeHolder.visible
             }
+            BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
                 id: originalImage; smooth: true; source: "http://" + getImagePath(content)
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png b/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png
new file mode 100644
index 0000000..664c2b1
--- /dev/null
+++ b/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/qmldir b/demos/declarative/photoviewer/PhotoViewerCore/qmldir
index 1adce10..4821faa 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/qmldir
+++ b/demos/declarative/photoviewer/PhotoViewerCore/qmldir
@@ -3,3 +3,4 @@ PhotoDelegate PhotoDelegate.qml
 ProgressBar ProgressBar.qml
 RssModel RssModel.qml
 Tag Tag.qml
+BusyIndicator BusyIndicator.qml
diff --git a/tests/benchmarks/corelib/io/qurl/main.cpp b/tests/benchmarks/corelib/io/qurl/main.cpp
new file mode 100644
index 0000000..49ace64
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qurl/main.cpp
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qurl.h>
+#include <qtest.h>
+
+class tst_qurl: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void emptyUrl();
+    void relativeUrl();
+    void absoluteUrl();
+    void isRelative_data();
+    void isRelative();
+    void toLocalFile_data();
+    void toLocalFile();
+    void toString_data();
+    void toString();
+    void toEncoded_data();
+    void toEncoded();
+    void resolved_data();
+    void resolved();
+    void equality_data();
+    void equality();
+    void qmlPropertyWriteUseCase();
+
+private:
+    void generateFirstRunData();
+};
+
+void tst_qurl::emptyUrl()
+{
+    QBENCHMARK {
+        QUrl url;
+    }
+}
+
+void tst_qurl::relativeUrl()
+{
+    QBENCHMARK {
+        QUrl url("pics/avatar.png");
+    }
+}
+
+void tst_qurl::absoluteUrl()
+{
+    QBENCHMARK {
+        QUrl url("/tmp/avatar.png");
+    }
+}
+
+void tst_qurl::generateFirstRunData()
+{
+    QTest::addColumn<bool>("firstRun");
+
+    QTest::newRow("construction + first run") << true;
+    QTest::newRow("subsequent runs") << false;
+}
+
+void tst_qurl::isRelative_data()
+{
+    generateFirstRunData();
+}
+
+void tst_qurl::isRelative()
+{
+    QFETCH(bool, firstRun);
+    if (firstRun) {
+        QBENCHMARK {
+            QUrl url("pics/avatar.png");
+            url.isRelative();
+        }
+    } else {
+        QUrl url("pics/avatar.png");
+        QBENCHMARK {
+            url.isRelative();
+        }
+    }
+}
+
+void tst_qurl::toLocalFile_data()
+{
+    generateFirstRunData();
+}
+
+void tst_qurl::toLocalFile()
+{
+    QFETCH(bool, firstRun);
+    if (firstRun) {
+        QBENCHMARK {
+            QUrl url("/tmp/avatar.png");
+            url.toLocalFile();
+        }
+    } else {
+        QUrl url("/tmp/avatar.png");
+        QBENCHMARK {
+            url.toLocalFile();
+        }
+    }
+}
+
+void tst_qurl::toString_data()
+{
+    generateFirstRunData();
+}
+
+void tst_qurl::toString()
+{
+    QFETCH(bool, firstRun);
+    if(firstRun) {
+        QBENCHMARK {
+            QUrl url("pics/avatar.png");
+            url.toString();
+        }
+    } else {
+        QUrl url("pics/avatar.png");
+        QBENCHMARK {
+            url.toString();
+        }
+    }
+}
+
+void tst_qurl::toEncoded_data()
+{
+   generateFirstRunData();
+}
+
+void tst_qurl::toEncoded()
+{
+   QFETCH(bool, firstRun);
+   if(firstRun) {
+       QBENCHMARK {
+           QUrl url("pics/avatar.png");
+           url.toEncoded(QUrl::FormattingOption(0x100));
+       }
+   } else {
+       QUrl url("pics/avatar.png");
+       QBENCHMARK {
+           url.toEncoded(QUrl::FormattingOption(0x100));
+       }
+   }
+}
+
+void tst_qurl::resolved_data()
+{
+   generateFirstRunData();
+}
+
+void tst_qurl::resolved()
+{
+    QFETCH(bool, firstRun);
+    if(firstRun) {
+        QBENCHMARK {
+            QUrl baseUrl("/home/user/");
+            QUrl url("pics/avatar.png");
+            baseUrl.resolved(url);
+        }
+    } else {
+        QUrl baseUrl("/home/user/");
+        QUrl url("pics/avatar.png");
+        QBENCHMARK {
+            baseUrl.resolved(url);
+        }
+    }
+}
+
+void tst_qurl::equality_data()
+{
+   generateFirstRunData();
+}
+
+void tst_qurl::equality()
+{
+    QFETCH(bool, firstRun);
+    if(firstRun) {
+        QBENCHMARK {
+            QUrl url("pics/avatar.png");
+            QUrl url2("pics/avatar2.png");
+            //url == url2;
+        }
+    } else {
+        QUrl url("pics/avatar.png");
+        QUrl url2("pics/avatar2.png");
+        QBENCHMARK {
+            url == url2;
+        }
+    }
+}
+
+void tst_qurl::qmlPropertyWriteUseCase()
+{
+    QUrl base("file:///home/user/qt/demos/declarative/samegame/SamegameCore/");
+    QString str("pics/redStar.png");
+
+    QBENCHMARK {
+        QUrl u = QUrl(str);
+        if (!u.isEmpty() && u.isRelative())
+            u = base.resolved(u);
+    }
+}
+
+QTEST_MAIN(tst_qurl)
+
+#include "main.moc"
diff --git a/tests/benchmarks/corelib/io/qurl/qurl.pro b/tests/benchmarks/corelib/io/qurl/qurl.pro
new file mode 100644
index 0000000..1d2d35e
--- /dev/null
+++ b/tests/benchmarks/corelib/io/qurl/qurl.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qurl
+QT -= gui
+win32: DEFINES+= _CRT_SECURE_NO_WARNINGS
+
+SOURCES += main.cpp
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
index e48194a..b14531d 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/data/samegame/BoomBlock.qml
@@ -1,4 +1,5 @@
 import Qt 4.6
+import Qt.labs.particles 1.0
 
 Item { id:block
     property bool dying: false