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
..
codecs	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-20 22:36:19 +01:00
completer	Fix typos	2018-02-13 15:51:10 +00:00
customcompleter	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
echoplugin	Doc: Modify connect statements Echoplugin Example	2018-05-16 11:59:27 +00:00
i18n	Doc: Update connect syntax in I18n Widgets Example	2018-04-09 06:51:23 +00:00
plugandpaint	Examples: Cleanup and modernize Plug&Paint	2018-06-06 11:55:44 +00:00
regexp	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
regularexpression	regularexpression example: Add raw string literal display	2018-03-17 18:15:15 +00:00
settingseditor	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-20 22:36:19 +01:00
styleplugin	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
treemodelcompleter	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
undo	Examples: fix superfluous ';' in undo example	2018-03-12 20:38:18 +00:00
undoframework	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
tools.pro	Convert the old feature system	2016-09-15 08:24:10 +00:00