diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-02 14:34:29 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-04 09:24:33 +0200 |
| commit | 2fed04bc1b8cb35934f005d740fef4cbe76d30d7 (patch) | |
| tree | 40b75384abde88444e558a0ee33b47ea43e10b47 | |
| parent | 29f22fb5e8007cd280533ac765d355075f7102f5 (diff) | |
Re-enable declarative_ui testsv5.4.0-alpha1
Disable pinch/flick test for now as it doesn't pass.
Nevertheless we want to enable the other tests to maintain
quality.
Task-number: QTBUG-31797
Change-Id: I1b73079fc102cc9a1ee649122daf950522722b09
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | tests/auto/declarative_ui/declarative_ui.pro | 1 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_pinch_and_flick.qml_disabled (renamed from tests/auto/declarative_ui/tst_map_pinch_and_flick.qml) | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/declarative_ui/declarative_ui.pro b/tests/auto/declarative_ui/declarative_ui.pro index 0cd6735a..1936fbc6 100644 --- a/tests/auto/declarative_ui/declarative_ui.pro +++ b/tests/auto/declarative_ui/declarative_ui.pro @@ -11,7 +11,6 @@ QT += location quick OTHER_FILES = *.qml TESTDATA = $$OTHER_FILES -win32|linux:CONFIG+=insignificant_test # QTBUG-31797 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 # Import path used by 'make check' since CI doesn't install test imports diff --git a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml_disabled index 206ff70c..206ff70c 100644 --- a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml +++ b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml_disabled |