Liang Qi 87204c856a Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/corelib/thread/qsemaphore.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707		2017-11-30 09:16:58 +01:00
..
main.cpp	tests: Unify license to GPL-EXCEPT	2017-04-03 07:18:46 +00:00
mainwindow.cpp	QCocoaMenu: Attach menu items when updating the menubar	2017-11-05 01:39:30 +00:00
mainwindow.h	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +00:00
mainwindow.ui	QCocoaMenu: Attach menu items when updating the menubar	2017-11-05 01:39:30 +00:00
menurama.pro
menuramaapplication.cpp	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-30 09:16:58 +01:00
menuramaapplication.h	Menurama: Fix custom application class constructor signature	2017-11-17 13:30:40 +00:00