whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui
History
Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	configure
	configure.pri
	examples/widgets/painting/fontsampler/mainwindow.cpp
	examples/widgets/painting/fontsampler/mainwindow.h
	mkspecs/features/moc.prf
	src/corelib/global/qglobal.h
	src/gui/text/qtextdocument.cpp

Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
 		2016-12-16 16:38:33 +01:00
..
image Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00
itemmodels QStandardItemModel: Reset the flags on clear() 2016-02-17 11:39:13 +00:00
kernel Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00
math3d Updated license headers 2016-01-21 18:55:18 +00:00
painting Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
qopengl Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qopenglconfig Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
text Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
util Fix test for WinRT 2016-09-23 07:20:53 +00:00
gui.pro Clean up some conditions in our pro files 2016-11-14 19:22:17 +00:00