whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets
History
Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/win32-g++/qmake.conf
	mkspecs/win32-icc/qmake.conf
	src/platformsupport/fontdatabases/mac/coretext.pri
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
 		2017-05-29 10:54:41 +02:00
..
animation examples: remove some unneeded QStringRef::toString() calls 2017-04-07 14:35:04 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
dialogs Example: migrate the classwizard example to use QRegularExpression 2017-01-24 20:28:41 +00:00
doc Merge remote-tracking branch 'origin/5.9' into dev 2017-05-29 10:54:41 +02:00
draganddrop Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
effects Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Merge remote-tracking branch 'origin/5.9' into dev 2017-05-10 10:11:57 +02:00
itemviews Merge remote-tracking branch 'origin/5.9' into dev 2017-03-28 09:28:31 +02:00
layouts Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
mac macOS: Make QMacNativeWidget example more usable 2017-02-12 12:29:55 +00:00
mainwindows Deprecate QSignalMapper 2017-03-14 16:33:59 +00:00
painting Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-16 21:51:11 +01:00
richtext Doc: updated QSyntaxHighlighter documentation and use QRegularExpression 2017-04-12 22:09:43 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Examples: Remove more redundant virtual specifiers for overriders 2016-11-29 10:06:02 +00:00
tools Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00
tutorials Tutorial: migrate addressbook tutorial to use QRegularExpression 2017-01-24 07:24:13 +00:00
widgets tablet example: enable high-DPI rendering 2017-05-15 20:49:12 +00:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro examples: fix compile without gui module 2017-05-05 06:54:15 +00:00