diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-11-14 05:38:18 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-14 08:16:36 +0100 |
| commit | 7dc37bc9b580efb5916144c00df128dd24e67faa (patch) | |
| tree | ed8e70944cab4f336b2827dbf9d1ff7f5bce0b17 /doc/src/snippets/declarative/qml-documents | |
| parent | 21de6faafef6210ffe5082f667e83d2bbc5a8772 (diff) | |
Get tst_examples passing again
Shared QDeclarativeEngine sidesteps GC slowdown issue.
New approach also verifies that the root object successfully loaded,
this picks up all the cases where it did not successfully load before.
Most of these were because they weren't importing QtQuick 2.0, import
statements have been updated. One was because it does not create a
QQuickItem root, it has been manually excluded. This required adding per
file exclusions to the current directory exclusions.
Change-Id: I809f0f20acc319aef58ba2e30e672e32f640686d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'doc/src/snippets/declarative/qml-documents')
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/declarative/qml-documents/inline-component.qml b/doc/src/snippets/declarative/qml-documents/inline-component.qml index 11a8f9617b..4b12a02368 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-component.qml +++ b/doc/src/snippets/declarative/qml-documents/inline-component.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [document] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { width: 240; height: 320; diff --git a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml index 1d8676481f..bb577617d7 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml +++ b/doc/src/snippets/declarative/qml-documents/inline-text-component.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [document] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { width: 240; height: 320; diff --git a/doc/src/snippets/declarative/qml-documents/non-trivial.qml b/doc/src/snippets/declarative/qml-documents/non-trivial.qml index c2dd5e1c8a..63eea45064 100644 --- a/doc/src/snippets/declarative/qml-documents/non-trivial.qml +++ b/doc/src/snippets/declarative/qml-documents/non-trivial.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [document] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { width: 240; height: 320; diff --git a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml index 2d08d655ec..62a2279708 100644 --- a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml +++ b/doc/src/snippets/declarative/qml-documents/qmldocuments.qml @@ -39,7 +39,7 @@ ****************************************************************************/ //! [document] -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { property alias text: textItem.text |