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
..
gradients.cpp	Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'	2011-09-12 16:03:47 +02:00
gradients.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
gradients.html	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
gradients.pro	Merge remote branch 'gerrit/master' into refactor	2011-07-06 14:08:02 +02:00
gradients.qrc	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
main.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00