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
..
qgraphicsanchorlayout	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsanchorlayout1	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicseffectsource	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsgridlayout	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsitem	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qgraphicsitemanimation	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicslayout	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicslayoutitem	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicslinearlayout	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsobject	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicspixmapitem	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicspolygonitem	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsproxywidget	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qgraphicsscene	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qgraphicssceneindex	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicstransform	Update copyright headers	2015-02-11 06:49:51 +00:00
qgraphicsview	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
qgraphicswidget	Fix qgraphicswidget::initStyleOption autotest	2015-06-06 12:00:52 +00:00
graphicsview.pro	Re-enable tests tst_qgraphicsproxywidget, tst_qgraphicswidget.	2013-07-24 22:16:58 +02:00