qt5base-lts/tests/benchmarks/corelib
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
..
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 tests: do not run benchmarks by default in 'make check' 2011-07-19 13:11:37 +02:00
corelib.pro Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00