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
..
cfsocketnotifier	QCFSocketNotifier: initialize member variable to avoid crash	2013-05-13 13:29:48 +02:00
cglconvenience	Support running Qt apps on the integrated GPU	2014-01-10 13:28:13 +01:00
devicediscovery	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
eglconvenience	EGL convenience: Guard Linux-specific code with Q_OS_LINUX.	2014-02-10 10:47:57 +01:00
eventdispatchers	Doc: Adding mark-up to boolean default values.	2013-10-08 00:46:27 +02:00
fbconvenience	Disable terminal keyboard on eglfs and linuxfb	2014-01-24 15:31:51 +01:00
fontdatabases	Decrease code duplication	2014-02-06 11:38:49 +01:00
glxconvenience	glxconvenience: Add a QT_XCB_FORCE_SOFTWARE_OPENGL environment variable.	2014-02-07 15:55:24 +01:00
input	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
linuxaccessibility	Accessibility Linux: Report Active state	2014-02-11 16:03:02 +01:00
services	Improve desktop environment detection.	2013-04-24 19:45:26 +02:00
themes	Merge remote-tracking branch 'origin/stable' into dev	2014-02-07 13:07:25 +01:00
platformsupport.pro	Remove jniconvenience from platformsupport.	2013-09-20 23:45:06 +02:00