From 2fed04bc1b8cb35934f005d740fef4cbe76d30d7 Mon Sep 17 00:00:00 2001 From: Alex Blasche <alexander.blasche@digia.com> Date: Tue, 2 Sep 2014 14:34:29 +0200 Subject: [PATCH] Re-enable declarative_ui tests 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> --- tests/auto/declarative_ui/declarative_ui.pro | 1 - ..._pinch_and_flick.qml => tst_map_pinch_and_flick.qml_disabled} | 0 2 files changed, 1 deletion(-) rename tests/auto/declarative_ui/{tst_map_pinch_and_flick.qml => tst_map_pinch_and_flick.qml_disabled} (100%) diff --git a/tests/auto/declarative_ui/declarative_ui.pro b/tests/auto/declarative_ui/declarative_ui.pro index 0cd6735a4..1936fbc69 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 similarity index 100% rename from tests/auto/declarative_ui/tst_map_pinch_and_flick.qml rename to tests/auto/declarative_ui/tst_map_pinch_and_flick.qml_disabled -- GitLab