Liang Qi 096e37910d Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: .qmake.conf src/corelib/kernel/qeventdispatcher_cf.mm src/gui/kernel/qguiapplication_p.h src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/ios/qioseventdispatcher.mm src/plugins/platforms/windows/qwindowsdrag.h src/plugins/platforms/windows/qwindowsinternalmimedata.h src/plugins/platforms/windows/qwindowsmime.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246		2018-06-07 19:10:53 +02:00
..
.gitignore
qtreeview.pro	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
tst_qtreeview.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-06-07 19:10:53 +02:00