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
..
testdata	Remove exec bits from files that should not be executable	2015-06-07 22:50:19 +00:00
.gitignore	Moved sql autotests into new directory structure	2011-09-06 09:32:15 +02:00
qsqldatabase.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
tst_databases.h	Added SSL support for MySQL database connections	2015-06-14 15:49:24 +00:00
tst_qsqldatabase.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00