diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2014-12-18 14:33:07 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2014-12-22 09:27:55 +0100 |
| commit | 4bee095069273ae27606a3f5b79f3aed4a94cee3 (patch) | |
| tree | e8d4fff44953a11e59c55a2776168555f54a9384 /tests/auto/corelib/io/qloggingregistry | |
| parent | 4fec0dca877855488d0eeb8ce5d0d682497ad1e3 (diff) | |
Android: Fix QLoggingRegistry test
The qtlogging.ini file needs to be detectable by QFINDTESTDATA,
so we put it in a qrc file on Android.
Change-Id: I5fb0217098c56f2b2e99ab8d1642c4a7904b18d1
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'tests/auto/corelib/io/qloggingregistry')
| -rw-r--r-- | tests/auto/corelib/io/qloggingregistry/android_testdata.qrc | 5 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qloggingregistry/android_testdata.qrc b/tests/auto/corelib/io/qloggingregistry/android_testdata.qrc new file mode 100644 index 0000000000..7563fb9630 --- /dev/null +++ b/tests/auto/corelib/io/qloggingregistry/android_testdata.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>qtlogging.ini</file> + </qresource> +</RCC> diff --git a/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro b/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro index c6c4caace3..6be5fb1067 100644 --- a/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro +++ b/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro @@ -6,3 +6,8 @@ QT = core core-private testlib SOURCES += tst_qloggingregistry.cpp OTHER_FILES += qtlogging.ini + +android:!android-no-sdk: { + RESOURCES += \ + android_testdata.qrc +} |