AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
305dd1b61f
qt5base-lts/tests/auto/gui/painting/qpainter
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
drawEllipse Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawLine_rop_bitmap Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawPixmap_rop Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
drawPixmap_rop_bitmap Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
utils/createImages Updated license headers 2016-01-21 18:55:18 +00:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
qpainter.pro Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags 2018-01-20 18:16:59 +00:00
task217400.png Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
testdata.qrc Android: Fix QPainter autotest 2015-01-08 10:03:27 +01:00
tst_qpainter.cpp Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00