Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
accessible	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
bearer	Refactor and remove dead code, add property caching.	2014-02-07 05:34:30 +01:00
generic	Cleanup TSLib plugin	2014-02-11 16:03:02 +01:00
imageformats	Doc: Adding mark-up to boolean default values.	2013-10-08 00:46:27 +02:00
platforminputcontexts	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
platforms	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00
platformthemes	GTK FileDialog: don't convert QUrl to QString prematurely	2014-01-09 17:54:23 +01:00
printsupport	QPrintEngine - Fix PPK_CollateCopies	2014-02-05 19:33:54 +01:00
sqldrivers	Move the dbmstype to QSqlDriverPrivate so it can be used for all drivers	2013-04-02 19:02:26 +02:00
plugins.pro	WinRT: Added networkinterface and hostinfo	2013-12-06 15:06:47 +01:00