AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3fe74b76fd
qt5base-lts/tests/auto/widgets/styles/qstyle
History
Oswald Buddenhagen ee07b912a1 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
	src/plugins/styles/mac/qmacstyle_mac.mm
	src/widgets/widgets/qdockarealayout.cpp
	src/widgets/widgets/qmainwindow.cpp
	src/widgets/widgets/qmainwindowlayout.cpp
	src/widgets/widgets/qmainwindowlayout_p.h
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
	tests/auto/other/macnativeevents/BLACKLIST
	tests/auto/widgets/widgets/qmenu/BLACKLIST

Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
2017-08-02 22:52:32 +02:00
..
images Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
qstyle.pro QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
testdata.qrc tst_QStyle::drawItemPixmap(): Check on the image color 2017-07-19 07:33:38 +00:00
tst_qstyle.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00