AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
153e8b49ad
qt5base-lts/examples/widgets/tools
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
..
codecs Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
completer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
customcompleter Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
echoplugin Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
i18n Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
plugandpaint Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
regexp Unify license header usage. 2016-03-29 10:20:03 +00:00
regularexpression regularexpression example: Fix compilation with clipboard disabled 2017-09-28 04:14:02 +00:00
settingseditor Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
styleplugin Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
treemodelcompleter Example: migrate treemodelcompleter example to use QRegularExpression 2017-03-07 23:11:31 +00:00
undo Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
undoframework Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
tools.pro Convert the old feature system 2016-09-15 08:24:10 +00:00