From 6f3cdff090df6f4cf9044a667c3f331b779a84b5 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 5 Feb 2010 16:31:58 +1000
Subject: Fix test.

---
 .../declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
index ceee8f6..8ebdf19 100644
--- a/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
+++ b/tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp
@@ -124,8 +124,7 @@ void tst_qmlgraphicsborderimage::imageSource_data()
         << "Cannot open  QUrl( \"file://" SRCDIR "/data/no-such-file.png\" )  ";
     QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << "";
     QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true
-        << "Network error loading \"" SERVER_ADDR "/no-such-file.png\" "
-            "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
+        << "\"Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found\" ";
 }
 
 void tst_qmlgraphicsborderimage::imageSource()
-- 
cgit v0.12


From 3b4c7da266d8118c57e75f93f2a624f470683b2b Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 8 Feb 2010 10:57:57 +1000
Subject: Fix private header include.

---
 src/declarative/util/qmlopenmetaobject_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/util/qmlopenmetaobject_p.h b/src/declarative/util/qmlopenmetaobject_p.h
index 73e3a98..450f258 100644
--- a/src/declarative/util/qmlopenmetaobject_p.h
+++ b/src/declarative/util/qmlopenmetaobject_p.h
@@ -42,7 +42,7 @@
 #ifndef QMLOPENMETAOBJECT_H
 #define QMLOPENMETAOBJECT_H
 
-#include <qmlrefcount_p.h>
+#include <private/qmlrefcount_p.h>
 #include <QtCore/QMetaObject>
 #include <QtCore/QObject>
 
-- 
cgit v0.12