Frederik Gladhorn a2850e54d5 Merge remote-tracking branch 'origin/release' into stable ... Conflicts: src/gui/painting/qdrawhelper.cpp src/gui/painting/qdrawhelper_avx.cpp src/gui/painting/qdrawhelper_x86_p.h Change-Id: I09352d05119f6fd000319074a2705b38361b2c90		2014-03-17 12:29:11 +01:00
..
qstatictext.pro	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
tst_qstatictext.cpp	Fix drawCachedGlyphs on RGBA8888	2014-02-26 14:18:21 +01:00