qt5base-lts/tests/auto/corelib
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
..
animation Moving Tests to new Autotest Structure 2011-08-24 10:09:19 +02:00
codecs Moving relevant tests to corelib/codecs 2011-08-26 08:49:59 +02:00
concurrent Fix autotests to build on Windows. 2011-08-31 13:26:27 +02:00
global Merge branch 'master' into refactor 2011-09-12 07:49:03 +02:00
io Disabled tests for refactor->master integration 2011-09-13 08:25:05 +02:00
kernel Merge branch 'refactor' 2011-09-13 08:54:45 +02:00
plugin Disabled tests for refactor->master integration 2011-09-13 08:25:05 +02:00
statemachine Moving relevant tests to corelib/statemachine 2011-09-01 12:54:42 +02:00
thread Moving relevant tests to corelib/thread 2011-09-01 12:54:58 +02:00
tools Disabled tests for refactor->master integration 2011-09-13 08:25:05 +02:00
xml Moving relevant tests to corelib/xml 2011-09-01 13:08:32 +02:00
corelib.pro Moving relevant tests to corelib/xml 2011-09-01 13:08:32 +02:00