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
..
qscroller.pro	Make tests compile without gui-private	2012-08-02 17:25:37 +02:00
tst_qscroller.cpp	Merge branch 'dev' into stable	2013-03-20 13:49:28 +01:00