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
..
moc	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00
qdbuscpp2xml	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qdbusxml2cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qmake	Don't run qmake test that requires macx makespec on non Mac OS platforms	2013-02-20 00:46:50 +01:00
rcc	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
uic	Fix module name format in displayed code	2013-02-11 01:43:21 +01:00
tools.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00