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
..
android	Make sure libgnustl_shared.so is deployed along with Qt libs	2013-07-04 10:04:27 +02:00
bic/data	test: Add 5.1.0 bic data for linux-gcc-ia32	2013-07-08 21:47:36 +02:00
cmake	Only expect EGL libraries in the cmake files if Qt is configured to use it.	2013-05-07 22:43:14 +02:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	QtConcurrent tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:25 +01:00
corelib	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
dbus	Let qdbusxml2cpp generate code that compiles: no '-' in variable names.	2013-07-01 17:04:26 +02:00
gui	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
installed_cmake	Add a unit test for testing Qt in its install location.	2013-07-02 23:08:54 +02:00
network	Merge remote-tracking branch 'origin/stable' into dev	2013-06-27 13:06:38 +02:00
opengl	Add object names to QGLWidget-reparenting test.	2013-06-14 15:13:26 +02:00
other	Merge branch 'release' into stable	2013-07-03 18:33:26 +02:00
printsupport	QPrintPreviewDialog: Prevent changing of page in resize handling.	2013-05-23 09:31:27 +02:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Cleanup the SQL tests	2013-04-25 19:59:16 +02:00
testlib	QtTest: Output correct library name	2013-05-27 00:41:46 +02:00
tools	make split_value_list() even less sane again	2013-07-03 21:38:37 +02:00
widgets	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
xml	tst_qdom: Fix warning about character conversion,	2013-06-08 10:29:34 +02:00
auto.pro	Make the CMake tests run sequentially, not in parallel.	2013-07-08 14:48:03 +02:00
network-settings.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtest-config.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test.pl	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00