whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets/mainwindows/mainwindow
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
..
colorswatch.cpp Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
colorswatch.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
main.cpp Updated license headers 2016-01-21 18:55:32 +00:00
mainwindow.cpp Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
mainwindow.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
mainwindow.pro clean up example project files, mostly wrt QT+=widgets 2012-12-17 14:08:17 +01:00
mainwindow.qrc Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
qt.png Doc: Replaced Trolltech logo with Qt logo 2016-02-03 12:37:37 +00:00
titlebarCenter.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
titlebarLeft.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
titlebarRight.png Moving .qdoc files under examples/widgets/doc 2012-08-20 12:20:55 +02:00
toolbar.cpp Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01:00
toolbar.h Updated license headers 2016-01-21 18:55:32 +00:00