AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f0c915de70
qt5base-lts/tests/benchmarks/gui
History
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
animation Update copyright headers 2015-02-11 06:49:51 +00:00
graphicsview Update copyright headers 2015-02-11 06:49:51 +00:00
image fix usage of wince scope 2015-06-05 10:29:10 +00:00
itemviews Update copyright headers 2015-02-11 06:49:51 +00:00
kernel Update copyright headers 2015-02-11 06:49:51 +00:00
math3d Update copyright headers 2015-02-11 06:49:51 +00:00
painting Update copyright headers 2015-02-11 06:49:51 +00:00
styles Update copyright headers 2015-02-11 06:49:51 +00:00
text Fix users of QTextLayout::additionalFormats to use the new API 2015-05-30 10:56:24 +00:00
gui.pro add and use qtHaveModule() function 2012-12-21 19:05:02 +01:00