Oswald Buddenhagen 76c0be34cd Merge branch 'dev' into stable ... This starts Qt 5.1 release cycle Conflicts: src/gui/text/qfontdatabase.cpp src/gui/text/qharfbuzz_copy_p.h src/widgets/kernel/qapplication.cpp src/widgets/kernel/qcoreapplication.cpp Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b		2013-03-20 13:49:28 +01:00
..
cfsocketnotifier	iOS: Implement socket notifiers.	2013-02-27 23:56:10 +01:00
cglconvenience	Enforce OpenGL context creation under Cocoa	2013-02-23 01:34:06 +01:00
devicediscovery	Introducing the Qt Android port	2013-03-05 08:31:23 +01:00
dnd	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
eglconvenience	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
eventdispatchers	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
fbconvenience	Style fixes for android enablers	2013-02-27 18:02:34 +01:00
fontdatabases	Make sure that we #include qconfig.h before testing for features.	2013-03-19 07:02:57 +01:00
glxconvenience	Pass the surface format to qglx_surfaceFormatFromGLXFBConfig	2013-02-23 12:56:05 +01:00
input	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
jniconvenience	Fixed android-no-sdk build by excluding platformsupport/jniconvenience.	2013-03-07 09:18:53 +01:00
linuxaccessibility	Make qaccessible2.h internal.	2013-03-14 19:49:38 +01:00
services	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
themes	Merge remote-tracking branch 'origin/stable' into dev	2013-03-06 14:38:07 +01:00
platformsupport.pro	Added JNI convenience classes in QtPlatformSupport.	2013-03-05 18:41:30 +01:00