diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 15:49:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 15:49:08 +0000 |
| commit | 7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (patch) | |
| tree | cde8deeea717fc25d64640d96cf13a4fd44d9db1 /tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro | |
| parent | 2aeb2bcef48d7bca2186c262dde433737956a539 (diff) | |
| parent | 305dd1b61f657474d751cc3b24f58249ec21b61b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro')
| -rw-r--r-- | tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro b/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro index 287ab30993..ac976e9b9c 100644 --- a/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro +++ b/tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro @@ -7,7 +7,7 @@ QT = core core-private testlib SOURCES += tst_qloggingregistry.cpp TESTDATA += qtlogging.ini -android { +android:!android-embedded { RESOURCES += \ android_testdata.qrc } |