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
..
image	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
itemmodels	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	Fix MSVC-warnings about double to float truncation.	2014-01-24 20:26:39 +01:00
math3d	Add operator[] to QVectorND classes	2013-08-27 17:50:40 +02:00
painting	Tests for semi transparent blend on opaque formats	2014-01-29 00:18:15 +01:00
qopengl	Add takeTexture() to QOpenGLFramebufferObject	2014-01-07 13:04:18 +01:00
text	Support empty inline elements in block tags in QTextDocument	2014-02-05 09:10:25 +01:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00