Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
accessible	Deal with unused functions, as found by the Intel compiler	2013-07-01 02:02:17 +02:00
bearer	BlackBerry QNetworkConfiguration: Keep track of bearer type	2013-06-24 15:09:06 +02:00
generic	Correct location of mtdev define.	2013-04-03 00:37:48 +02:00
imageformats	Remove use of 'register' from Qt.	2013-06-17 09:44:22 +02:00
platforminputcontexts	Make access to xkbcommon_workaround.h more generic	2013-05-07 22:43:14 +02:00
platforms	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
platformthemes	don't customize dialog buttons if GTK version is too old	2013-04-30 12:45:30 +02:00
printsupport	Add support for setting/getting the paper name on the QPrinter	2013-03-12 09:16:42 +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	Don't build the bearer plugin if network is not available	2013-02-19 19:20:47 +01:00