diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-07-21 10:35:11 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2014-07-21 20:37:51 +0200 |
| commit | e8a97d874332f7fb6d4c80481ea923ccb6bc09b6 (patch) | |
| tree | 8c939d348ecee8c418091264f33a9bc88584ae12 /tests/auto/android | |
| parent | a09ef38456a56b157dd284455df3ee691f59023c (diff) | |
| download | qtbase-e8a97d874332f7fb6d4c80481ea923ccb6bc09b6.tar.gz | |
Android: Use androiddeployqt from qt path.
Change-Id: I085f2b20d1f53e3f5caf0b208f64a75c26a89219
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'tests/auto/android')
| -rwxr-xr-x | tests/auto/android/runtests_androiddeployqt.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/android/runtests_androiddeployqt.pl b/tests/auto/android/runtests_androiddeployqt.pl index c949e1cf87..3946da964f 100755 --- a/tests/auto/android/runtests_androiddeployqt.pl +++ b/tests/auto/android/runtests_androiddeployqt.pl @@ -300,6 +300,7 @@ sub waitForProcess my $src_dir_qt=abs_path(dirname($0)."/../../.."); my $quadruplor_dir="$src_dir_qt/tests/auto/android"; my $qmake_path="$src_dir_qt/bin/qmake"; +my $androiddeployqt_path="$src_dir_qt/bin/androiddeployqt"; my $tests_dir="$src_dir_qt/tests$testsubset"; my $temp_dir=tempdir(CLEANUP => 1); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); @@ -389,9 +390,9 @@ foreach (split("\n",$testsFiles)) print $res if (!$silent); my $application=basename(cwd); if ($silent) { - $cmd="androiddeployqt --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json >/dev/null 2>&1"; + $cmd="$androiddeployqt_path --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json >/dev/null 2>&1"; } else { - $cmd="androiddeployqt --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json"; + $cmd="$androiddeployqt_path --install ${deployqt_device_serial} --output ${temp_dir} --deployment debug --verbose --input android-libtst_${application}.so-deployment-settings.json"; } $res = qx(${cmd}); print $res if (!$silent); |