Frederik Gladhorn e65cd6f379 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629		2013-02-14 14:24:57 +01:00
..
qsql	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsqldatabase	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
qsqldriver	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsqlerror	QSqlError test: Fix isValid()-check for constructed QSqlError.	2013-02-04 14:44:19 +01:00
qsqlfield	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsqlquery	QSqlQuery tests: fix create table failures	2013-02-12 12:42:54 +01:00
qsqlrecord	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsqlresult	Fix warning about unhandled enumeration values in tst_sqldriver.	2013-01-28 09:41:39 +01:00
qsqlthread	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
kernel.pro	SQL: Change in QSqlResultPrivate::positionalToNamedBinding()	2012-12-10 21:23:35 +01:00