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
..
images	Cleaning up the QPainter/arthur testing stuff	2011-06-29 15:10:14 +02:00
scripts	Add basic static text drawing capability to lance	2011-06-03 15:13:11 +02:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
images.qrc	Cleaning up the QPainter/arthur testing stuff	2011-06-29 15:10:14 +02:00
lancelot.pro	Tests: Add widgets module to profile.	2011-08-29 15:35:18 +02:00
paintcommands.cpp	Add option to compare to different platform in lancelot autotest	2011-09-01 16:14:18 +02:00
paintcommands.h	Cleaning up the QPainter/arthur testing stuff	2011-06-29 15:10:14 +02:00
tst_lancelot.cpp	Merge remote branch 'gerrit/master' into HEAD	2011-09-06 10:55:40 +02:00