Qt Forward Merge Bot 7d86b35dc6 Merge remote-tracking branch 'origin/5.14' into 5.15 ... Conflicts: .qmake.conf src/qml/types/qqmlbind.cpp src/quick/items/qquicklistview.cpp tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp Change-Id: Id6805c13256ad13d5651011e5dd09bba0ec02987		2020-02-06 08:41:57 +01:00
..
Qt5QuickCompilerConfig.cmake.in	Fix regression when using CONFIG+=QtQuickCompiler and .qrc files in subdirs	2019-09-19 11:32:23 +02:00
generateloader.cpp	Fix *.js files disappearing from RESOURCES when not using QtQml	2019-09-09 07:52:25 +02:00
qmlcache.prf	Minor data structure cleanup	2018-01-22 09:21:38 +00:00
qmlcachegen.cpp	Avoid deprecated non-q-prefixed hex() function	2019-12-17 09:47:15 +01:00
qmlcachegen.pro	Add support for scanning qrc files in qmlimportscanner	2019-10-24 10:14:43 +02:00
qtquickcompiler.prf	Merge remote-tracking branch 'origin/5.14' into 5.15	2020-02-06 08:41:57 +01:00
resourcefilter.cpp	Fix regression when using CONFIG+=QtQuickCompiler and .qrc files in subdirs	2019-09-19 11:32:23 +02:00