From 0e28a97c16f78e222841981653e71175313a4f4c Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 28 Jan 2011 15:40:55 +1000 Subject: photoviewer needs QtQuick 1.1 for Image::cache --- demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml index bfc8756..dcb1112 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 1.0 +import QtQuick 1.1 import "script/script.js" as Script Package { -- cgit v0.12 From 6bdac26b9fc1575ee7783a47604108efc7058dcb Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 28 Jan 2011 15:58:07 +1000 Subject: Update test, versioning is fixed so expect-fail no longer needed --- tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp index a5e708b..4626c9c 100644 --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp @@ -615,7 +615,6 @@ void tst_QDeclarativeLoader::implicitSize() QCOMPARE(item->property("implHeight").toReal(), 100.); - QEXPECT_FAIL("", "versioned property implicit object reference", Continue); QCOMPARE(item->property("implWidth").toReal(), 100.); delete item; -- cgit v0.12