qt5base-lts/tests/auto/sql/kernel/qsqlquery
Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/widgets/styles/qgtkstyle_p.cpp
	tests/auto/corelib/io/qtextstream/test/test.pro
	tests/auto/corelib/plugin/plugin.pro

Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b
2016-03-21 09:02:57 +01:00
..
.gitignore Moved sql autotests into new directory structure 2011-09-06 09:32:15 +02:00
qsqlquery.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00
tst_qsqlquery.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00