whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets
History
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
..
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-05-29 01:00:09 +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 qtlite: Skip building examples when configured with no-feature-itemviews 2018-01-12 07:58:20 +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 Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
tools Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
tutorials Doc: Add formatting features to Notepad example 2018-06-01 09:54:56 +00:00
widgets Merge remote-tracking branch 'origin/5.11' into dev 2018-05-24 16:29:14 +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