From fd18d13612dd74ddd8747fd28905ad791eb4f4ff Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 12 Feb 2015 13:35:03 +0100 Subject: Use qrc for test data in QFileInfo test on all platforms To make the test compatible with cross-compilation, we need to bundle test data in qrc, and then extract files to the file system during initialization. We did this for Android before, but the change is required on many platforms and since it will also work on desktop platforms, we consistently just do it this way everywhere. Change-Id: I7f65bd9e1dd6f217e6adffda44a40da7599cfe72 Reviewed-by: Christian Stromme --- tests/auto/corelib/io/qfileinfo/qfileinfo.pro | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tests/auto/corelib/io/qfileinfo/qfileinfo.pro') diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro index 3fd58b4958..aa5a9d92f1 100644 --- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro @@ -2,13 +2,8 @@ CONFIG += testcase TARGET = tst_qfileinfo QT = core-private testlib SOURCES = tst_qfileinfo.cpp -RESOURCES += qfileinfo.qrc - -TESTDATA += qfileinfo.qrc qfileinfo.pro tst_qfileinfo.cpp resources/file1 resources/file1.ext1 resources/file1.ext1.ext2 +RESOURCES += qfileinfo.qrc \ + testdata.qrc win32*:!wince*:!winrt:LIBS += -ladvapi32 -lnetapi32 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 - -android:!android-no-sdk: { - RESOURCES += android_testdata.qrc -} -- cgit v1.2.3