From c5b928207ec33417933ee8c03ece8e79db9934f4 Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Thu, 1 Mar 2012 13:33:40 +1000 Subject: Fixed qlocale unittest to install subprogram syslocaleapp correctly - It was trying to install syslocaleapp sub program as TESTDATA instead of an application. Change-Id: I2117d11335bc2fd37a8ccc9a03b0337382f0177f Reviewed-by: Rohan McGovern --- tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro | 3 --- tests/auto/corelib/tools/qlocale/test/test.pro | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'tests/auto/corelib/tools') diff --git a/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro index a97350ca3f..b61f51d53a 100644 --- a/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro +++ b/tests/auto/corelib/tools/qlocale/syslocaleapp/syslocaleapp.pro @@ -6,6 +6,3 @@ CONFIG -= app_bundle QT = core -# This app is testdata for tst_qlocale -target.path = $$[QT_INSTALL_TESTS]/tst_qlocale/$$TARGET -INSTALLS += target diff --git a/tests/auto/corelib/tools/qlocale/test/test.pro b/tests/auto/corelib/tools/qlocale/test/test.pro index eafd8c1699..24dcc0638a 100644 --- a/tests/auto/corelib/tools/qlocale/test/test.pro +++ b/tests/auto/corelib/tools/qlocale/test/test.pro @@ -12,6 +12,8 @@ win32 { TARGET = ../../release/tst_qlocale } } -TESTDATA += syslocaleapp + +load(testcase) # for target.path and installTestHelperApp() +installTestHelperApp("../syslocaleapp/syslocaleapp",syslocaleapp,syslocaleapp) mac: CONFIG += insignificant_test # QTBUG-22769 -- cgit v1.2.3