qt5base-lts/tests/auto/sql/kernel
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
..
qsql fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsqldatabase Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qsqldriver fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsqlerror Update copyright headers 2015-02-11 06:49:51 +00:00
qsqlfield Update copyright headers 2015-02-11 06:49:51 +00:00
qsqlquery fix usage of wince scope 2015-06-05 10:29:10 +00:00
qsqlrecord Update copyright headers 2015-02-11 06:49:51 +00:00
qsqlresult Update copyright headers 2015-02-11 06:49:51 +00:00
qsqlthread fix usage of wince scope 2015-06-05 10:29:10 +00:00
kernel.pro SQL: Change in QSqlResultPrivate::positionalToNamedBinding() 2012-12-10 21:23:35 +01:00