AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
153e8b49ad
qt5base-lts/examples/widgets
History
Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	src/network/access/qhttp2protocolhandler_p.h
	src/network/kernel/kernel.pri
	src/network/ssl/qsslkey_qt.cpp
	src/plugins/platforms/cocoa/qcocoascreen.mm
	src/plugins/platforms/windows/accessible/iaccessible2.cpp
	src/plugins/platforms/windows/accessible/iaccessible2.h
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
	src/widgets/widgets/qmenu_p.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp
	tests/auto/testlib/selftests/expected_cmptest.lightxml
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/testlib/selftests/expected_cmptest.xml

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9
2017-11-23 09:36:03 +01:00
..
animation Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
dialogs examples: remove wince leftovers 2017-09-22 19:22:07 +00:00
doc Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
draganddrop Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
effects Use qRadiansToDegrees() and qDegreesToRadians() more widely 2017-07-05 10:15:34 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
itemviews Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00: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 Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01:00
painting Merge remote-tracking branch 'origin/5.9' into dev 2017-07-13 16:36:10 -07:00
richtext Convert features.printdialog to QT_[REQUIRE_]CONFIG 2017-05-30 17:21:26 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
tools Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01:00
tutorials Tutorial: migrate addressbook tutorial to use QRegularExpression 2017-01-24 07:24:13 +00:00
widgets Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01: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