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

4 files changed, 3 insertions, 3 deletions

diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 18dc206..9e54758 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -106,14 +106,14 @@ Rectangle {
         id: view1
         anchors.top: titleBar.bottom
         anchors.bottom: parent.bottom
-        x: parent.left
+        x: 0
         width: parent.width
         model: folders1
         delegate: folderDelegate
         highlight: Rectangle { color: palette.highlight; visible: root.keyPressed }
         focus: true
         pressDelay: 100
-        state: current
+        state: "current"
         states: [
             State {
                 name: "current"
diff --git a/examples/declarative/loader/main.cpp b/examples/declarative/loader/main.cpp
index 0993814..c4d3f81 100644
--- a/examples/declarative/loader/main.cpp
+++ b/examples/declarative/loader/main.cpp
@@ -92,7 +92,7 @@ public:
     Q_INVOKABLE void launch(const QString &fileName)
     {
         QUrl url(fileName);
-        QFileInfo fi(fileName);
+        QFileInfo fi(url.toLocalFile());
         if (fi.exists()) {
             url = QUrl::fromLocalFile(fi.absoluteFilePath());
             QmlContext *ctxt = canvas->rootContext();
diff --git a/examples/declarative/progressbar/images/progressbar-background.png b/examples/declarative/progressbar/images/progressbar-background.png
deleted file mode 100644
index e36bcfc..0000000
--- a/examples/declarative/progressbar/images/progressbar-background.png
+++ /dev/null
diff --git a/examples/declarative/progressbar/images/progressbar-highlight.png b/examples/declarative/progressbar/images/progressbar-highlight.png
deleted file mode 100644
index 987d455..0000000
--- a/examples/declarative/progressbar/images/progressbar-highlight.png
+++ /dev/null