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
..
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
double_data.h	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
qstring.pro	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
tst_qstring.cpp	Merge remote branch 'gerrit/master' into HEAD	2011-09-06 10:55:40 +02:00