From d98dedd5ee4a9ba038e84df521237631645f3762 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sat, 26 Dec 2015 22:51:32 +0100 Subject: [PATCH] qt5-build.eclass: replace deprecated virtualmake usage with virtx (cherry picked from proj/qt commit b545feebf73592d8068d7ac71264a786328e3e73) --- eclass/qt5-build.eclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 6534f8106d2b..8120c9f74161 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -246,14 +246,13 @@ qt5-build_src_test() { _EOF_ chmod +x "${testrunner}" - _qt5_test_runner() { + local testcmd=( qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check - } - + ) if [[ ${VIRTUALX_REQUIRED} == test ]]; then - VIRTUALX_COMMAND="_qt5_test_runner" virtualmake + virtx "${testcmd[@]}" else - _qt5_test_runner + "${testcmd[@]}" fi } -- 2.26.2