qt5base-lts/examples/widgets/tools
Oswald Buddenhagen ee07b912a1 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
	src/plugins/styles/mac/qmacstyle_mac.mm
	src/widgets/widgets/qdockarealayout.cpp
	src/widgets/widgets/qmainwindow.cpp
	src/widgets/widgets/qmainwindowlayout.cpp
	src/widgets/widgets/qmainwindowlayout_p.h
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
	tests/auto/other/macnativeevents/BLACKLIST
	tests/auto/widgets/widgets/qmenu/BLACKLIST

Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
2017-08-02 22:52:32 +02:00
..
codecs Example: migrate the codecs example to use QRegularExpression 2017-02-15 14:45:40 +00:00
completer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
customcompleter Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
echoplugin Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
i18n Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
plugandpaint Be (somewhat more) consistent about the value of pi 2017-06-20 09:53:46 +00:00
regexp Unify license header usage. 2016-03-29 10:20:03 +00:00
regularexpression Regular Expression Example: Add context menu 2017-07-19 20:58:19 +00:00
settingseditor Example: migrate settingseditor example to use QRegularExpression 2017-02-15 14:45:36 +00:00
styleplugin Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
treemodelcompleter Example: migrate treemodelcompleter example to use QRegularExpression 2017-03-07 23:11:31 +00:00
undo Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
undoframework Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
tools.pro Convert the old feature system 2016-09-15 08:24:10 +00:00