diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-05 14:03:19 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-31 09:33:44 (GMT) |
| commit | 524394e37c594807ed874f4926bf13af990358d1 (patch) | |
| tree | afa93f597e96218ca023b6a213bf6598c126135b /doc | |
| parent | e6b7178bc2e62a37b4737695bced1b46bced9215 (diff) | |
| download | Qt-524394e37c594807ed874f4926bf13af990358d1.zip Qt-524394e37c594807ed874f4926bf13af990358d1.tar.gz Qt-524394e37c594807ed874f4926bf13af990358d1.tar.bz2 | |
Make the examples test for QtDeclarative pass.
- Fix check to indicate immediate errors, skip the loading
state (using QTRY_VERIFY from shared/utils.h)
and check for errors after loading again.
- Exclude all broken examples.
- Exclude shaders if import path is missing or OpenGL is
not present.
- 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.
Task-number: QTQAINFRA-428
Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
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 6577581..4f4c0c0 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 b53081e..d78bbea 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 2f70497..26a414d 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] |