From 16e4ae01bb0cda830224414892f7809c876ae112 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Wed, 14 Oct 2020 20:19:38 +0200 Subject: [PATCH] Move file of test helpers out of directory for qtconcurrentmap tests The test helpers are used both in the qtconcurrentmap tests and in the qtconcurrentfilter tests. In the future, they should also be used in generated tests. This patch moves the function out of the qtconcurrentmap folder as it is not specific to 'map'. Change-Id: Ie79a7ae3040a7eab7364a3aabf934158c7527b5a Reviewed-by: Sona Kurazyan Reviewed-by: Qt CI Bot --- .../concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp | 2 +- tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp | 2 +- .../{qtconcurrentmap/functions.h => testhelper_functions.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/auto/concurrent/{qtconcurrentmap/functions.h => testhelper_functions.h} (100%) diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp index 53b1b0fb552..28e83fbee51 100644 --- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp +++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp @@ -30,7 +30,7 @@ #include #include -#include "../qtconcurrentmap/functions.h" +#include "../testhelper_functions.h" class tst_QtConcurrentFilter : public QObject { diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp index 021dac86f05..804f14e6284 100644 --- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp +++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp @@ -34,7 +34,7 @@ #include -#include "functions.h" +#include "../testhelper_functions.h" class tst_QtConcurrentMap : public QObject { diff --git a/tests/auto/concurrent/qtconcurrentmap/functions.h b/tests/auto/concurrent/testhelper_functions.h similarity index 100% rename from tests/auto/concurrent/qtconcurrentmap/functions.h rename to tests/auto/concurrent/testhelper_functions.h