Frederik Gladhorn a9c88c1f39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/image/qimage.cpp src/gui/text/qtextengine.cpp src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp src/printsupport/kernel/qprintengine_win.cpp Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444		2014-02-12 16:28:07 +01:00
..
signalbug	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
test	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
.gitignore	QObject-test: Reorganize subprocess.	2011-12-14 07:07:09 +01:00
qobject.pro	Fixed tst_qobject signalbug silently not compiled in -fast builds.	2012-02-23 09:06:44 +01:00
tst_qobject.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-02-12 16:28:07 +01:00