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 /tools/qml/qmlruntime.h | |
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 'tools/qml/qmlruntime.h')
-rw-r--r-- | tools/qml/qmlruntime.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 2fd5f967..76674d04 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -174,11 +174,10 @@ private: QAction *recordAction; RecordingDialog *recdlg; - void senseImageMagick(); void senseFfmpeg(); QWidget *ffmpegHelpWindow; bool ffmpegAvailable; - bool convertAvailable; + const bool convertAvailable; QAction *rotateAction; QActionGroup *orientation; |