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

..

apache_org.html

Initial import from the monolithic Qt.

2011-04-27 12:05:43 +02:00

htmlinfo.pro

Merge remote-tracking branch 'origin/5.5' into dev

2015-07-01 11:05:26 +02:00

main.cpp

Updated BSD licensed file headers

2015-02-15 07:41:17 +00:00

nokia_com.html

Initial import from the monolithic Qt.

2011-04-27 12:05:43 +02:00

resources.qrc

More examples adjusted to Symbian and Maemo5.

2011-05-23 15:10:51 +02:00

simpleexample.html

Update copyright headers

2015-02-11 06:49:51 +00:00

trolltech_com.html

Initial import from the monolithic Qt.

2011-04-27 12:05:43 +02:00

w3c_org.html

Initial import from the monolithic Qt.

2011-04-27 12:05:43 +02:00

youtube_com.html

Initial import from the monolithic Qt.

2011-04-27 12:05:43 +02:00