whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets
History
Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
 		2018-07-02 11:23:45 +02:00
..
animation sub-attaq example: Fix crash with software Open GL 2018-03-14 13:27:08 +00:00
desktop Merge remote-tracking branch 'origin/5.10' into dev 2018-01-20 22:36:19 +01:00
dialogs qtlite: Skip building examples when configured with no-feature-itemviews 2018-01-12 07:58:20 +00:00
doc Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
draganddrop qtlite: Skip building examples when configured with no-feature-itemviews 2018-01-12 07:58:20 +00:00
effects Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
gestures Doc: Add missing full stops in briefs 2018-06-21 14:23:30 +00:00
graphicsview Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
itemviews Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
layouts Doc: Complete Dynamic Layouts Example 2018-03-14 12:44:20 +00:00
mac macOS: Make QMacNativeWidget example more usable 2017-02-12 12:29:55 +00:00
mainwindows Merge remote-tracking branch 'origin/5.11' into dev 2018-05-03 14:50:22 +02:00
painting Merge remote-tracking branch 'origin/5.11' into dev 2018-04-26 09:55:10 +02:00
richtext Merge remote-tracking branch 'origin/5.11' into dev 2018-05-24 16:29:14 +02:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Doc: Update Factorial Example 2018-06-07 14:29:50 +00:00
tools Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
tutorials Notepad example: Wrap clipboard functions with QT_CONFIG(clipboard) 2018-06-22 14:37:48 +00:00
widgets Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro Make sure we can build with -no-feature-draganddrop 2018-05-29 18:31:35 +00:00