AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
740ff1b881
qt5base-lts/examples/widgets
History
Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	configure
	configure.pri
	examples/widgets/painting/fontsampler/mainwindow.cpp
	examples/widgets/painting/fontsampler/mainwindow.h
	mkspecs/features/moc.prf
	src/corelib/global/qglobal.h
	src/gui/text/qtextdocument.cpp

Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
2016-12-16 16:38:33 +01:00
..
animation Examples: Remove a redundant virtual specifier for overriders 2016-11-25 22:36:21 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
dialogs Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
doc Doc: update Qt Widgets examples 2016-12-12 14:43:02 +00: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 Examples: Remove more redundant virtual specifiers for overriders 2016-11-29 10:06:02 +00:00
itemviews Examples: Remove a redundant virtual specifier for overriders 2016-11-25 22:36:21 +00:00
layouts Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
mainwindows Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
painting Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00
richtext Examples: Remove a redundant virtual specifier for overriders 2016-11-25 22:36:21 +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 remove bogus qtConfig(simulator_and_device) condition 2016-10-16 00:12:33 +00:00
tutorials Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro Clean up some conditions in our pro files 2016-11-14 19:22:17 +00:00