Liang Qi b5a956601f Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp tests/auto/corelib/io/qresourceengine/qresourceengine_test.pro Change-Id: I3169f709cc2a1b75007cb23c02c4c79b74feeb04		2018-05-08 20:43:45 +02:00
..
staticplugin	Make it easier to use resources in plugins when using static linking	2018-04-23 13:56:07 +00:00
testqrc	…
.gitattributes	…
.gitignore	…
android_testdata.qrc	…
parentdir.txt	…
qresourceengine.pro	tst_qresourceengine: Fix test for configurations with builtin_testdata	2018-05-07 07:59:37 +00:00
qresourceengine_test.pro	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-08 20:43:45 +02:00
tst_qresourceengine.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-08 20:43:45 +02:00