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 /tests/auto/declarative/examples/examples.pro | |
| 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 'tests/auto/declarative/examples/examples.pro')
| -rw-r--r-- | tests/auto/declarative/examples/examples.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro index 111962a5..8ff6b6ef 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/declarative/examples/examples.pro @@ -2,6 +2,9 @@ CONFIG += testcase testcase.timeout = 400 # this test is slow TARGET = tst_examples +!contains(QT_CONFIG, webkit): DEFINES += QT_NO_WEBKIT +!contains(QT_CONFIG, xmlpatterns): DEFINES += QT_NO_XMLPATTERNS + QT += testlib contains(QT_CONFIG,declarative): QT += declarative macx:CONFIG -= app_bundle @@ -14,5 +17,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test -CONFIG+=insignificant_test # QTQAINFRA-428 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |