qt5base-lts/examples/widgets/tools
Qt Forward Merge Bot 053e7cce79 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	.qmake.conf
	src/corelib/doc/src/objectmodel/signalsandslots.qdoc
	src/plugins/platforms/cocoa/qcocoamenuloader.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	tests/auto/gui/image/qimage/tst_qimage.cpp

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
2018-08-07 17:44:51 +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 Doc: Synchronize documentation with code snippet 2018-08-01 14:48:38 +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