diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 18:33:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 19:40:45 +0000 |
| commit | f3060312c89344744832e3352fe4f53efcb94c9b (patch) | |
| tree | de69be5e25a1acd3207a8952376f634fe94fefcc /tests/auto/corelib/io/qdir/qdir.pro | |
| parent | c29d3692d700f7ef6d5833242878b4ec6f81c928 (diff) | |
| parent | a15c3d086dafea83e4760f0b447be43d26b80697 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/io/qdir/qdir.pro')
| -rw-r--r-- | tests/auto/corelib/io/qdir/qdir.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qdir/qdir.pro b/tests/auto/corelib/io/qdir/qdir.pro index 26bc60a731..e8f5d1079a 100644 --- a/tests/auto/corelib/io/qdir/qdir.pro +++ b/tests/auto/corelib/io/qdir/qdir.pro @@ -6,6 +6,8 @@ RESOURCES += qdir.qrc TESTDATA += testdir testData searchdir resources entrylist types tst_qdir.cpp +contains(CONFIG, builtin_testdata): DEFINES += BUILTIN_TESTDATA + android:!android-no-sdk { RESOURCES += android_testdata.qrc } |