Frederik Gladhorn a1fe728fa5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e		2014-02-07 13:07:25 +01:00
..
qsql	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
qsqldatabase	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
qsqldriver	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
qsqlerror	Enable QSqlError to handle alphanumeric error codes.	2013-12-20 16:27:41 +01:00
qsqlfield	QtSql tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 14:42:15 +01:00
qsqlquery	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
qsqlrecord	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
qsqlresult	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
qsqlthread	Fix sql tests in respect to Oracle databases	2013-04-05 11:13:28 +02:00
kernel.pro	SQL: Change in QSqlResultPrivate::positionalToNamedBinding()	2012-12-10 21:23:35 +01:00