diff options
author | Liang Qi <liang.qi@qt.io> | 2018-05-09 13:38:34 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-06-25 08:01:19 +0000 |
commit | c3059391fea326b7115cf038ecdad8e820a0c2d5 (patch) | |
tree | 7038db26d996020fb8a63d97814b7053bc3d44da /tests/auto/other/qcomplextext | |
parent | 4c68e2558c8b90f301032f2e29130e6ac509dc21 (diff) |
Make tests compile for Android
This only enables compilation, it doesn't fix any test.
Qt on Android supports process, but not TEST_HELPER_INSTALLS. See also
acdd57cb for winrt.
android-ndk-r10e is used to compile, see
http://doc-snapshots.qt.io/qt5-5.11/androidgs.html .
corelib/io/{qdir,qresourceengine} need to be fixed later.
Done-with: Frederik Gladhorn <frederik.gladhorn@qt.io>
Done-with: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Change-Id: I34b924c8ae5d46d6835b8f0a6606450920f4423b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests/auto/other/qcomplextext')
-rw-r--r-- | tests/auto/other/qcomplextext/android_testdata.qrc | 6 | ||||
-rw-r--r-- | tests/auto/other/qcomplextext/qcomplextext.pro | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/other/qcomplextext/android_testdata.qrc b/tests/auto/other/qcomplextext/android_testdata.qrc new file mode 100644 index 0000000000..828176df4a --- /dev/null +++ b/tests/auto/other/qcomplextext/android_testdata.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/android_testdata"> + <file>data/BidiCharacterTest.txt</file> + <file>data/BidiTest.txt</file> + </qresource> +</RCC> diff --git a/tests/auto/other/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro index d51dcb4cff..5135b48fee 100644 --- a/tests/auto/other/qcomplextext/qcomplextext.pro +++ b/tests/auto/other/qcomplextext/qcomplextext.pro @@ -8,5 +8,7 @@ TESTDATA += data android { RESOURCES += \ - testdata.qrc + android_testdata.qrc } + +builtin_testdata: DEFINES += BUILTIN_TESTDATA |