qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Menu: ensure the correct delegates are used when created via Component	Mitch Curtis	2018-09-05	3	-0/+206
\| \| \| \| \| \| \| \| \| \|	Don't add items until we're complete, as the delegate could change in the meantime. Instead, add them to contentData and create them when we're complete. Task-number: QTBUG-67559 Change-Id: I5f42129f49de861ff5f15d0069daeda0b4e5017c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
*	Menu: fix items not being scrollable when using Window	Mitch Curtis	2018-06-25	3	-0/+174
\| \| \| \| \| \| \| \| \| \|	Use Window.window instead of ApplicationWindow.window, as the former will always result in a window regardless of which type of window is in use. Task-number: QTBUG-68858 Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
*	Merge remote-tracking branch 'origin/5.9' into 5.10	J-P Nurmi	2017-09-27	6	-0/+1293
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore tests/auto/auto.pro tests/auto/qquickmenu/tst_qquickmenu.cpp tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: I7e5a7b39d890796fd63a7b24ae19765ab41fecda
*	Rename tst_menu to tst_QQuickMenu	J-P Nurmi	2017-09-27	8	-0/+965
	Change-Id: I1c7e1a2b337e9d16bc6c9b098db08f29f1b9d1e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>