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
..
android	Add missing license header	2013-03-05 08:31:23 +01:00
bic/data	Make qaccessible2.h internal.	2013-03-14 19:49:38 +01:00
cmake	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
corelib	Support connection to functor with multiple operator()	2013-03-19 23:16:38 +01:00
dbus	Fix wildcard signal disconnection in QDBusAbstractInterface	2013-03-19 07:03:25 +01:00
gui	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
opengl	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
other	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
printsupport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
testlib	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
tools	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
widgets	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
xml	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
auto.pro	Check for printsupport module when building according auto tests	2013-02-19 19:20:58 +01: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