Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
db2	Remove use of QFlag in the SQL drivers	2013-08-24 17:41:38 +02:00
ibase	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
mysql	Fix sub-second handling in MySQL driver	2013-11-28 00:21:56 +01:00
oci	Fix compilation of OCI driver	2013-12-01 14:47:03 +01:00
odbc	Remove use of QFlag in the SQL drivers	2013-08-24 17:41:38 +02:00
psql	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
sqlite	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
sqlite2	QSQLITE2Driver: use Q_DECLARE_PUBLIC/Q_DECLARE_PRIVATE	2013-04-08 14:31:41 +02:00
tds	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
drivers.pri	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00