AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
318b58562a
qt5base-lts/examples/widgets
History
Liang Qi 318b58562a Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	.qmake.conf
	mkspecs/common/msvc-desktop.conf
	mkspecs/common/msvc-version.conf
	mkspecs/common/winrt_winphone/qmake.conf
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/qt.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/winrt/default_pre.prf
	mkspecs/winphone-arm-msvc2013/qmake.conf
	mkspecs/winphone-x86-msvc2013/qmake.conf
	mkspecs/winrt-arm-msvc2013/qmake.conf
	mkspecs/winrt-x64-msvc2013/qmake.conf
	mkspecs/winrt-x86-msvc2013/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/network/kernel/qhostaddress.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.cpp
	src/plugins/platforms/mirclient/qmirclientplugin.h
	src/widgets/util/qsystemtrayicon.cpp
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
	tools/configure/Makefile.mingw
	tools/configure/Makefile.win32

Done-with: Jake Petroules <jake.petroules@qt.io>
Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
2017-01-25 20:06:06 +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 2017-01-25 20:06:06 +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: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +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 examples: Use lambdas instead of functor classes 2017-01-09 15:42:13 +00:00
painting Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00
richtext examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +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 examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +00:00
tutorials Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets examples: Use QOverload to select overloaded signals and slots 2016-12-22 14:54:55 +00: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