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
..
integrity	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
mac	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unix	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
win32	qmake vcxproj generator: fix XML conversion for build events	2011-09-08 19:50:28 +02:00
makefile.cpp	Added missing no_include_pwd check	2011-09-12 16:03:47 +02:00
makefile.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
makefiledeps.cpp	Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'	2011-09-12 16:03:47 +02:00
makefiledeps.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
metamakefile.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
metamakefile.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
projectgenerator.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
projectgenerator.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
xmloutput.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
xmloutput.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00