Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
qsqlresult.pro	SQL: Fix autotests for MinGW	2012-12-14 17:12:44 +01:00
testsqldriver.h	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
tst_qsqlresult.cpp	QSqlResult: fix parsing of bound SQL statements	2013-02-15 15:47:58 +01:00