Liang Qi 2609429d7a Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: src/imports/settings/qqmlsettings.cpp src/quick/items/qquickwindow.cpp tools/qmlplugindump/main.cpp Change-Id: I96fedbc773a110374baed79a0b7de92d65df0ed6		2018-10-29 08:10:45 +01:00
..
Info.plist	QML: Fix qmlplugindump Info.plist	2016-04-28 12:18:59 +00:00
main.cpp	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-10-29 08:10:45 +01:00
qmlplugindump.pro	Adjust QMAKE_TARGET_PRODUCT, QMAKE_TARGET_DESCRIPTION	2017-07-28 10:57:06 +00:00
qmlstreamwriter.cpp	tools: replace 'foreach' with 'range for'	2016-08-20 06:52:34 +00:00
qmlstreamwriter.h	Updated license headers	2016-01-20 11:46:25 +00:00
qmltypereader.cpp	Fix licensing	2017-05-04 04:30:21 +00:00
qmltypereader.h	Fix licensing	2017-05-04 04:30:21 +00:00