Gunnar Sletta b62bd0584a Merge branch 'refactor' ... Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310		2011-09-13 08:54:45 +02:00
..
codecs	tests: do not run benchmarks by default in 'make check'	2011-07-19 13:11:37 +02:00
io	test: removed bogus CONFIG+=debug in qdiriterator benchmark	2011-09-01 23:55:44 +02:00
kernel	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
plugin	tests: do not run benchmarks by default in 'make check'	2011-07-19 13:11:37 +02:00
thread	QMutex is now just a pointer	2011-07-29 10:32:07 +02:00
tools	optimize QList::removeAll()	2011-09-12 16:03:47 +02:00
corelib.pro	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00