Gunnar Sletta b62bd0584a Merge branch 'refactor' ... Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310		2011-09-13 08:54:45 +02:00
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qshortcut.pro	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
tst_qshortcut.cpp	Merge branch 'refactor'	2011-09-13 08:54:45 +02:00