AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dee35b5a78
qt5base-lts/examples/widgets
History
Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/global/qglobal.cpp
	src/corelib/tools/qstring.cpp
	src/network/socket/qabstractsocket.cpp
	src/network/socket/qnativesocketengine_unix.cpp
	src/plugins/platforms/eglfs/api/qeglfsglobal.h

Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
2016-08-16 07:58:32 +02:00
..
animation Fix/adapt the uses of {to,set,from}Time_t in the qtbase source code 2016-07-06 06:28:13 +00:00
desktop Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
dialogs Merge remote-tracking branch 'origin/5.7' into dev 2016-08-09 17:59:51 +02:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +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 Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
itemviews Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +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.7' into dev 2016-07-19 20:14:40 +02:00
richtext Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-08-09 17:59:51 +02: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 purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00