Samuel Rødal a6b6e760ac Merge remote branch 'gerrit/master' into HEAD ... Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b		2011-09-06 10:55:40 +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	Moving relevant tests to corelib/global	2011-08-30 13:17:21 +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