From 1e503d76340a753d7a024ca9adc1c095fa3338cb Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 29 May 2017 22:16:27 +0200 Subject: [PATCH] Move QGestureRecognizer test to widgets/kernel It's the subdir where the implementation also lives. There's no src/widgets/gestures, either. Change the mac: into a darwin: scope in the .pro file, so Sanity Bot does not complain. Change-Id: I7608d6da05af4a1117db585798a87a20ae80717a Reviewed-by: Friedemann Kleint --- tests/auto/widgets/gestures/gestures.pro | 6 ------ tests/auto/widgets/kernel/kernel.pro | 4 ++++ .../{gestures => kernel}/qgesturerecognizer/BLACKLIST | 0 .../qgesturerecognizer/qgesturerecognizer.pro | 0 .../qgesturerecognizer/tst_qgesturerecognizer.cpp | 0 tests/auto/widgets/widgets.pro | 1 - 6 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 tests/auto/widgets/gestures/gestures.pro rename tests/auto/widgets/{gestures => kernel}/qgesturerecognizer/BLACKLIST (100%) rename tests/auto/widgets/{gestures => kernel}/qgesturerecognizer/qgesturerecognizer.pro (100%) rename tests/auto/widgets/{gestures => kernel}/qgesturerecognizer/tst_qgesturerecognizer.cpp (100%) diff --git a/tests/auto/widgets/gestures/gestures.pro b/tests/auto/widgets/gestures/gestures.pro deleted file mode 100644 index 5a87a01ee2..0000000000 --- a/tests/auto/widgets/gestures/gestures.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS=\ - qgesturerecognizer \ - -mac: SUBDIRS -= \ # Uses native recognizers - qgesturerecognizer \ diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro index 20720dc928..73fd934502 100644 --- a/tests/auto/widgets/kernel/kernel.pro +++ b/tests/auto/widgets/kernel/kernel.pro @@ -6,6 +6,7 @@ SUBDIRS=\ qboxlayout \ qdesktopwidget \ qformlayout \ + qgesturerecognizer \ qgridlayout \ qlayout \ qstackedlayout \ @@ -19,4 +20,7 @@ SUBDIRS=\ qshortcut \ qsizepolicy +darwin:SUBDIRS -= \ # Uses native recognizers + qgesturerecognizer \ + SUBDIRS -= qsound diff --git a/tests/auto/widgets/gestures/qgesturerecognizer/BLACKLIST b/tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST similarity index 100% rename from tests/auto/widgets/gestures/qgesturerecognizer/BLACKLIST rename to tests/auto/widgets/kernel/qgesturerecognizer/BLACKLIST diff --git a/tests/auto/widgets/gestures/qgesturerecognizer/qgesturerecognizer.pro b/tests/auto/widgets/kernel/qgesturerecognizer/qgesturerecognizer.pro similarity index 100% rename from tests/auto/widgets/gestures/qgesturerecognizer/qgesturerecognizer.pro rename to tests/auto/widgets/kernel/qgesturerecognizer/qgesturerecognizer.pro diff --git a/tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp similarity index 100% rename from tests/auto/widgets/gestures/qgesturerecognizer/tst_qgesturerecognizer.cpp rename to tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index efcc47171d..8b6c4722be 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -8,4 +8,3 @@ SUBDIRS=\ styles \ util \ widgets \ - gestures \