AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b9923b30f0
qt5base-lts/tests/auto/widgets/styles/qstylesheetstyle
History
Edward Welbourne 23c9d4c98f Merge branch '5.11' into dev 
Conflicts:
	qmake/library/qmakebuiltins.cpp
	src/plugins/platforms/windows/qwindowstabletsupport.h
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/styles/qstylesheetstyle.cpp
	tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp

Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
2018-07-31 13:33:14 +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
BLACKLIST qtbase: cleanup BLACKLIST files 2018-02-13 15:20:33 +00:00
qstylesheetstyle.pro testlib: start sharing common helper functions 2017-11-04 20:11:22 +00:00
resources.qrc Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
tst_qstylesheetstyle.cpp Merge branch '5.11' into dev 2018-07-31 13:33:14 +02:00