diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-16 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-16 11:20:42 +0100 |
| commit | 0a4e5bb265c4a2345a9cbffab1b5150124b8d31e (patch) | |
| tree | b243668d53f710af3d57a44c18e1ed0c40b100f7 /tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro | |
| parent | 4772a2da15ae0624633f3fc4d029d5f0e1e33892 (diff) | |
| parent | bd828bacb982a51ee21f03487f8390cfc96cc6d3 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/widgets/kernel/qshortcut.cpp
tests/auto/network/access/spdy/tst_spdy.cpp
Change-Id: If76c434beac2c0a393440aa365f89f77439774ce
Diffstat (limited to 'tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro')
| -rw-r--r-- | tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro index f523116cc9..345e3d13b9 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qresourceengine -QT = core testlib +QT = core-private testlib SOURCES = tst_qresourceengine.cpp RESOURCES += testqrc/test.qrc @@ -15,7 +15,8 @@ QMAKE_DISTCLEAN += $${runtime_resource.target} TESTDATA += \ parentdir.txt \ - testqrc/* + testqrc/* \ + *.rcc GENERATED_TESTDATA = $${runtime_resource.target} android:!android-embedded { |