AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
305dd1b61f
qt5base-lts/tests/auto/gui
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
..
image Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
itemmodels QListWidgetItem/QStandardItem: pass role to dataChanged() signal 2018-01-26 19:58:26 +00:00
kernel Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
math3d Use qRadiansToDegrees() and qDegreesToRadians() more widely 2017-07-05 10:15:34 +00:00
painting Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
qopengl Merge remote-tracking branch 'origin/5.10' into dev 2017-10-24 13:40:55 +02:00
qopenglconfig Fix tst_QOpenGlConfig for platforms with builtin test data 2017-06-19 07:05:59 +00:00
qvulkan Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00
text Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
util GLSL 1.00 ES must be selected using "#version 100" 2017-08-04 11:19:30 +00:00
gui.pro Basic Vulkan enablers 2017-03-17 16:12:03 +00:00