qt5base-lts/tests/auto/corelib
Gunnar Sletta a9ac6da893 Merge branch 'master' into refactor
Conflicts:
	src/3rdparty/v8
	src/gui/text/qfont_qpa.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
	tests/auto/gui.pro
	tests/auto/network.pro
	tests/auto/qstring/tst_qstring.cpp

Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
2011-09-12 07:49:03 +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 Merge remote branch 'gerrit/master' into HEAD 2011-09-06 10:55:40 +02:00
kernel Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
plugin Moving relevant tests to corelib/plugin 2011-09-01 12:42:51 +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 Merge remote branch 'gerrit/master' into HEAD 2011-09-06 10:55:40 +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