diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-17 11:07:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 22:51:31 +0200 |
commit | b4e2cf5e4755828222f5a86dcb95c25584f89870 (patch) | |
tree | 60fc5fe64822fea7aa5687e21e9ac89008899659 /doc | |
parent | 5156fd1abb747b162dde52ce411968f84a42e8fd (diff) |
QtQuick1: Make the examples test for QtQuick1 pass.
- Fix check to indicate immediate errors, skip the loading
state and check for errors after loading again.
- Exclude all broken examples.
- Exclude Mac .app folders
- Fix the DeclarativeViewer to check for the presence
of the ImageMagick and ffmpeg executables only once,
reducing test time.
- Do not check for ImageMagick by running its command
line tool 'convert' on Windows, since Windows
has a tool of the same name that converts file
systems (!).
- Fix doc snippets to load correctly.
- Introduce defines in case WebKit or XmlPatterns
are not present (which existed in Qt 4).
Task-number: QTQAINFRA-428
Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'doc')
3 files changed, 7 insertions, 3 deletions
diff --git a/doc/src/snippets/declarative/models/views-models-delegates.qml b/doc/src/snippets/declarative/models/views-models-delegates.qml index 65775811..4f4c0c07 100644 --- a/doc/src/snippets/declarative/models/views-models-delegates.qml +++ b/doc/src/snippets/declarative/models/views-models-delegates.qml @@ -38,6 +38,8 @@ ** ****************************************************************************/ +import QtQuick 1.0 + //! [rectangle] Rectangle { width: 200; height: 200 diff --git a/doc/src/snippets/declarative/models/visual-model-and-view.qml b/doc/src/snippets/declarative/models/visual-model-and-view.qml index b53081ea..d78bbea3 100644 --- a/doc/src/snippets/declarative/models/visual-model-and-view.qml +++ b/doc/src/snippets/declarative/models/visual-model-and-view.qml @@ -38,6 +38,8 @@ ** ****************************************************************************/ +import QtQuick 1.0 + Rectangle { width: 200; height: 200 diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml index 2f704979..26a414d4 100644 --- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml +++ b/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml @@ -50,7 +50,7 @@ Rectangle { Column { //! [anchor fill] Rectangle { - id: button + id: button1 width: 100; height: 100 MouseArea { @@ -65,7 +65,7 @@ Rectangle { //! [anchor fill] Rectangle { - id: button + id: button2 width: 100; height: 100 //! [enable handlers] @@ -79,7 +79,7 @@ Rectangle { } Rectangle { - id: button + id: button3 width: 100; height: 100 //! [mouse handlers] |