Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

19 files changed, 1015 insertions, 35 deletions

diff --git a/src/3rdparty/README b/src/3rdparty/README
index 2be1036..ef05674 100644
--- a/src/3rdparty/README
+++ b/src/3rdparty/README
@@ -20,3 +20,8 @@ have been removed:
 
 Some patches are applied from time to time. Recent patches can be
 found in the patches subdirectory.
+
+
+The pvr2d.h & wsegl.h in the powervr directory are required for building
+the PowerVR plugin on Qt for Embedded Linux. These headers are for SGX
+based SoCs, but may also work on MBX SoCs.
diff --git a/src/3rdparty/powervr/pvr2d.h b/src/3rdparty/powervr/pvr2d.h
new file mode 100644
index 0000000..14823e0
--- /dev/null
+++ b/src/3rdparty/powervr/pvr2d.h
@@ -0,0 +1,502 @@
+/*!****************************************************************************

+@File          pvr2d.h

+@Title         PVR2D external header file

+@Author        Imagination Technologies

+@Copyright     Copyright (c) by Imagination Technologies Limited.

+				This specification is protected by copyright laws and contains

+				material proprietary to Imagination Technologies Limited.

+				You may use and distribute this specification free of charge for implementing 

+				the functionality therein, without altering or removing any trademark, copyright, 

+				or other notice from the specification.

+@Platform      Generic

+@Description   PVR2D definitions for PVR2D clients

+******************************************************************************/

+

+

+/******************************************************************************

+Modifications :-

+$Log: pvr2d.h $

+******************************************************************************/

+

+#ifndef _PVR2D_H_

+#define _PVR2D_H_

+

+#ifdef __cplusplus

+extern "C" {

+#endif 

+

+/* PVR2D Platform-specific definitions */

+#define PVR2D_EXPORT

+#define PVR2D_IMPORT

+

+

+#define PVR2D_REV_MAJOR		2

+#define PVR2D_REV_MINOR		1

+

+typedef enum

+{

+	PVR2D_FALSE = 0,

+	PVR2D_TRUE

+} PVR2D_BOOL;

+

+

+/* error codes */

+typedef enum

+{

+	PVR2D_OK = 0,

+	PVR2DERROR_INVALID_PARAMETER = -1,

+	PVR2DERROR_DEVICE_UNAVAILABLE = -2,

+	PVR2DERROR_INVALID_CONTEXT = -3,

+	PVR2DERROR_MEMORY_UNAVAILABLE = -4,

+	PVR2DERROR_DEVICE_NOT_PRESENT = -5,

+	PVR2DERROR_IOCTL_ERROR = -6,

+	PVR2DERROR_GENERIC_ERROR = -7,

+	PVR2DERROR_BLT_NOTCOMPLETE = -8,

+	PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,

+	PVR2DERROR_NOT_YET_IMPLEMENTED = -10,

+	PVR2DERROR_MAPPING_FAILED = -11

+}PVR2DERROR;

+

+

+/* pixel formats */

+typedef enum

+{

+	PVR2D_1BPP = 0,

+	PVR2D_RGB565,

+	PVR2D_ARGB4444,

+	PVR2D_RGB888,

+	PVR2D_ARGB8888,

+	PVR2D_ARGB1555,

+	PVR2D_ALPHA8,

+	PVR2D_ALPHA4,

+	PVR2D_PAL2,

+	PVR2D_PAL4,

+	PVR2D_PAL8,

+	PVR2D_VGAEMU

+

+}PVR2DFORMAT;

+

+

+/* wrap surface type */

+typedef enum

+{

+	PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,

+	PVR2D_WRAPFLAG_CONTIGUOUS = 1,

+

+}PVR2DWRAPFLAGS;

+

+/* flags for control information of additional blits */

+typedef enum

+{

+	PVR2D_BLIT_DISABLE_ALL					= 0x0000,	/* disable all additional controls */

+	PVR2D_BLIT_CK_ENABLE					= 0x0001,	/* enable colour key */

+	PVR2D_BLIT_GLOBAL_ALPHA_ENABLE			= 0x0002,	/* enable standard global alpha */

+	PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE	= 0x0004,	/* enable per-pixel alpha bleding */

+	PVR2D_BLIT_PAT_SURFACE_ENABLE			= 0x0008,	/* enable pattern surf (disable fill) */

+	PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE	= 0x0010,	/* enable fully specified alpha */

+	PVR2D_BLIT_ROT_90						= 0x0020,	/* apply 90 degree rotation to the blt */

+	PVR2D_BLIT_ROT_180						= 0x0040,	/* apply 180 degree rotation to the blt */

+	PVR2D_BLIT_ROT_270						= 0x0080,	/* apply 270 degree rotation to the blt */

+	PVR2D_BLIT_COPYORDER_TL2BR				= 0x0100,	/* copy order overrides */

+	PVR2D_BLIT_COPYORDER_BR2TL				= 0x0200,

+	PVR2D_BLIT_COPYORDER_TR2BL				= 0x0400,

+	PVR2D_BLIT_COPYORDER_BL2TR				= 0x0800,

+	PVR2D_BLIT_COLKEY_SOURCE				= 0x1000,	/* Key colour is on the source surface */

+	PVR2D_BLIT_COLKEY_DEST					= 0x2000	/* Key colour is on the destination surface */

+

+} PVR2DBLITFLAGS;

+

+/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */

+typedef enum

+{

+	PVR2D_ALPHA_OP_SRC_DSTINV = 1,	/* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */

+	PVR2D_ALPHA_OP_SRCP_DSTINV = 2	/* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */

+} PVR2D_ALPHABLENDFUNC;

+

+/* blend ops for fully specified alpha */

+typedef enum

+{

+	PVR2D_BLEND_OP_ZERO = 0,

+	PVR2D_BLEND_OP_ONE = 1,

+	PVR2D_BLEND_OP_SRC = 2,

+	PVR2D_BLEND_OP_DST = 3,

+	PVR2D_BLEND_OP_GLOBAL = 4,

+	PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,

+	PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6

+}PVR2D_BLEND_OP;

+

+

+typedef void* PVR2D_HANDLE;

+

+

+/* Fully specified alpha blend :	pAlpha field of PVR2DBLTINFO structure					*/

+/* a fully specified Alpha Blend operation is defined as									*/

+/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA))							*/

+/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB))								*/

+/* if the pre-multiplication stage is enabled then the equations become the following:		*/

+/* PRE_MUL     = ((SRC(A)) * (Global Alpha Value))											*/

+/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA))							*/

+/* DST (RGB)   = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB))								*/

+/* if the transparent source alpha stage is enabled then a source alpha of zero forces the	*/

+/* source to be transparent for that pixel regardless of the blend equation being used.		*/

+typedef struct _PVR2D_ALPHABLT

+{

+	PVR2D_BLEND_OP	eAlpha1;

+	PVR2D_BOOL		bAlpha1Invert;

+	PVR2D_BLEND_OP	eAlpha2;

+	PVR2D_BOOL		bAlpha2Invert;

+	PVR2D_BLEND_OP	eAlpha3;

+	PVR2D_BOOL		bAlpha3Invert;

+	PVR2D_BLEND_OP	eAlpha4;

+	PVR2D_BOOL		bAlpha4Invert;

+	PVR2D_BOOL		bPremulAlpha;			/* enable pre-multiplication stage */

+	PVR2D_BOOL		bTransAlpha;			/* enable transparent source alpha stage */

+	PVR2D_BOOL		bUpdateAlphaLookup;		/* enable and update the 1555-Lookup alpha table */

+	unsigned char	uAlphaLookup0;			/* 8 bit alpha when A=0 in a 1555-Lookup surface */

+	unsigned char	uAlphaLookup1;			/* 8 bit alpha when A=1 in a 1555-Lookup surface */

+	unsigned char	uGlobalRGB;				/* Global Alpha Value for RGB, 0=transparent 255=opaque */

+	unsigned char	uGlobalA;				/* Global Alpha Value for Alpha */

+

+} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;

+

+

+/* surface memory info structure */

+typedef struct _PVR2DMEMINFO

+{

+	void				*pBase;

+	unsigned long		ui32MemSize;

+	unsigned long		ui32DevAddr;

+	unsigned long		ulFlags;

+	void				*hPrivateData;

+	void				*hPrivateMapData;

+

+}PVR2DMEMINFO, *PPVR2DMEMINFO;

+

+

+#define PVR2D_MAX_DEVICE_NAME 20

+

+typedef struct _PVR2DDEVICEINFO

+{

+	unsigned long	ulDevID;

+	char			szDeviceName[PVR2D_MAX_DEVICE_NAME];

+}PVR2DDEVICEINFO;

+

+

+typedef struct _PVR2DISPLAYINFO

+{

+	unsigned long	ulMaxFlipChains;

+	unsigned long	ulMaxBuffersInChain;

+	PVR2DFORMAT		eFormat;

+	unsigned long	ulWidth;

+	unsigned long	ulHeight;

+	long			lStride;

+	unsigned long	ulMinFlipInterval;

+	unsigned long	ulMaxFlipInterval;

+

+}PVR2DDISPLAYINFO;

+

+

+typedef struct _PVR2DBLTINFO

+{

+	unsigned long	CopyCode;			/* rop code  */

+	unsigned long	Colour;				/* fill colour */

+	unsigned long	ColourKey;			/* colour key */

+	unsigned char	GlobalAlphaValue;	/* global alpha blending */

+	unsigned char	AlphaBlendingFunc;	/* per-pixel alpha-blending function */

+

+	PVR2DBLITFLAGS	BlitFlags;			/* additional blit control information */

+

+	PVR2DMEMINFO	*pDstMemInfo;		/* destination memory */

+	unsigned long	DstOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */

+	long			DstStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */

+	long			DstX, DstY;			/* pixel offset from start of dest surface to start of blt rectangle */

+	long			DSizeX,DSizeY;		/* blt size */

+	PVR2DFORMAT		DstFormat;			/* dest format */

+	unsigned long	DstSurfWidth;		/* size of dest surface in pixels */

+	unsigned long	DstSurfHeight;		/* size of dest surface in pixels */

+

+	PVR2DMEMINFO	*pSrcMemInfo;		/* source mem, (source fields are also used for patterns) */

+	unsigned long	SrcOffset;			/* byte offset from start of allocation to src/pat surface pixel 0,0 */

+	long			SrcStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */

+	long			SrcX, SrcY;			/* pixel offset from start of surface to start of source rectangle */

+										/* for patterns this is the start offset within the pattern */

+	long			SizeX,SizeY;		/* source rectangle size or pattern size in pixels */

+	PVR2DFORMAT		SrcFormat;			/* source/pattern format */

+	PVR2DMEMINFO	*pPalMemInfo;		/* source/pattern palette memory containing argb8888 colour table */

+	unsigned long	PalOffset;			/* byte offset from start of allocation to start of palette */

+	unsigned long	SrcSurfWidth;		/* size of source surface in pixels */

+	unsigned long	SrcSurfHeight;		/* size of source surface in pixels */

+

+	PVR2DMEMINFO	*pMaskMemInfo;		/* mask memory, 1bpp format implied */

+	unsigned long	MaskOffset;			/* byte offset from start of allocation to mask surface pixel 0,0 */

+	long			MaskStride;			/* signed stride, the number of bytes from pixel 0,0 to 0,1 */

+	long			MaskX, MaskY;		/* mask rect top left (mask size = blt size) */

+	unsigned long	MaskSurfWidth;		/* size of mask surface in pixels */

+	unsigned long	MaskSurfHeight;		/* size of mask surface in pixels */

+	

+	PPVR2D_ALPHABLT pAlpha;				/* fully specified alpha blend */

+

+}PVR2DBLTINFO, *PPVR2DBLTINFO;

+

+typedef struct _PVR2DRECT

+{

+	long left, top;

+	long right, bottom;

+} PVR2DRECT;

+

+typedef struct

+{

+	PVR2DMEMINFO	*pSurfMemInfo;		/* surface memory */

+	unsigned long	SurfOffset;			/* byte offset from start of allocation to destination surface pixel 0,0 */

+	long			Stride;				/* signed stride */

+	PVR2DFORMAT		Format;

+	unsigned long	SurfWidth;			/* surface size in pixels */

+	unsigned long	SurfHeight;

+

+} PVR2D_SURFACE, *PPVR2D_SURFACE;

+

+typedef struct

+{

+	unsigned long	*pUseCode;					/* USSE code */

+	unsigned long	UseCodeSize;				/* usse code size in bytes */

+

+} PVR2D_USECODE, *PPVR2D_USECODE;

+

+typedef struct

+{

+	PVR2D_SURFACE			sDst;				/* destination surface */

+	PVR2D_SURFACE			sSrc;				/* source surface */

+	PVR2DRECT				rcDest;				/* destination rectangle */

+	PVR2DRECT				rcSource;			/* source rectangle */

+	PVR2D_HANDLE			hUseCode;			/* custom USE code (NULL implies source copy) */

+	unsigned long			UseParams[2];		/* per-blt params for use code */

+

+} PVR2D_3DBLT, *PPVR2D_3DBLT;

+

+

+#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)

+

+typedef void* PVR2DCONTEXTHANDLE;

+typedef void* PVR2DFLIPCHAINHANDLE;

+

+

+// CopyCode field of PVR2DBLTINFO structure:

+// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.

+// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern

+// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask

+// common rop3 codes are defined below

+// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0

+// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.

+// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.

+// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.

+// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3

+// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's

+// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0

+#define PVR2DROP4(rop3b, rop3a)			((rop3b<<8)|rop3a)

+

+/* common rop codes */

+#define PVR2DROPclear				0x00       /* 0 (whiteness) */

+#define PVR2DROPset					0xFF       /* 1 (blackness) */

+#define PVR2DROPnoop				0xAA       /* dst (used for masked blts) */

+

+/* source and  dest rop codes */

+#define PVR2DROPand					0x88       /* src AND dst */

+#define PVR2DROPandReverse			0x44       /* src AND NOT dst */

+#define PVR2DROPcopy				0xCC       /* src (used for source copy and alpha blts) */

+#define PVR2DROPandInverted			0x22       /* NOT src AND dst */

+#define PVR2DROPxor					0x66       /* src XOR dst */

+#define PVR2DROPor					0xEE       /* src OR dst */

+#define PVR2DROPnor					0x11       /* NOT src AND NOT dst */

+#define PVR2DROPequiv				0x99       /* NOT src XOR dst */

+#define PVR2DROPinvert				0x55       /* NOT dst */

+#define PVR2DROPorReverse			0xDD       /* src OR NOT dst */

+#define PVR2DROPcopyInverted		0x33       /* NOT src */

+#define PVR2DROPorInverted			0xBB       /* NOT src OR dst */

+#define PVR2DROPnand				0x77       /* NOT src OR NOT dst */

+

+/* pattern rop codes */

+#define PVR2DPATROPand				0xA0       /* pat AND dst */

+#define PVR2DPATROPandReverse		0x50       /* pat AND NOT dst */

+#define PVR2DPATROPcopy				0xF0       /* pat (used for solid color fills and pattern blts) */

+#define PVR2DPATROPandInverted		0x0A       /* NOT pat AND dst */

+#define PVR2DPATROPxor				0x5A       /* pat XOR dst */

+#define PVR2DPATROPor				0xFA       /* pat OR dst */

+#define PVR2DPATROPnor				0x05       /* NOT pat AND NOT dst */

+#define PVR2DPATROPequiv			0xA5       /* NOT pat XOR dst */

+#define PVR2DPATROPinvert			0x55       /* NOT dst */

+#define PVR2DPATROPorReverse		0xF5       /* pat OR NOT dst */

+#define PVR2DPATROPcopyInverted		0x0F       /* NOT pat */

+#define PVR2DPATROPorInverted		0xAF       /* NOT pat OR dst */

+#define PVR2DPATROPnand				0x5F       /* NOT pat OR NOT dst */

+

+/* common rop4 codes */

+#define PVR2DROP4MaskedCopy              PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy)		/* masked source copy blt (used for rounded window corners etc) */

+#define PVR2DROP4MaskedFill              PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy)	/* masked colour fill blt (used for text) */

+

+/* Legacy support */

+#define PVR2DROP3_PATMASK			PVR2DPATROPcopy

+#define PVR2DROP3_SRCMASK			PVR2DROPcopy

+

+/* pixmap memory alignment */

+#define PVR2D_ALIGNMENT_4			4			/* DWORD alignment */

+#define PVR2D_ALIGNMENT_ANY			0			/* no alignment    */

+#define PVR2D_ALIGNMENT_PALETTE		16			/* 16 byte alignment is required for palettes */

+

+/* Heap number for PVR2DGetFrameBuffer */

+#define PVR2D_FB_PRIMARY_SURFACE 0

+

+#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE	(1 << 0)

+#define PVR2D_PRESENT_PROPERTY_DSTSIZE		(1 << 1)

+#define PVR2D_PRESENT_PROPERTY_DSTPOS		(1 << 2)

+#define PVR2D_PRESENT_PROPERTY_CLIPRECTS	(1 << 3)

+#define PVR2D_PRESENT_PROPERTY_INTERVAL		(1 << 4)

+

+

+#define PVR2D_CREATE_FLIPCHAIN_SHARED		(1 << 0)

+#define PVR2D_CREATE_FLIPCHAIN_QUERY		(1 << 1)

+

+/* Functions that the library exports */

+

+PVR2D_IMPORT

+int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID,

+									PVR2DCONTEXTHANDLE* phContext,

+									unsigned long ulFlags);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,

+							  PVR2DDISPLAYINFO *pDisplayInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,

+							  PVR2DFORMAT *pFormat,

+							  long *plWidth,

+							  long *plHeight,

+							  long *plStride,

+							  int *piRefreshRate);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,

+							   int nHeap,

+							   PVR2DMEMINFO **ppsMemInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,

+						 unsigned long ulBytes,

+						 unsigned long ulAlign,

+						 unsigned long ulFlags,

+						 PVR2DMEMINFO **ppsMemInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,

+						void *pMem,

+						unsigned long ulFlags,

+						unsigned long ulBytes,

+						unsigned long alPageAddress[],

+						PVR2DMEMINFO **ppsMemInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,

+						unsigned long ulFlags,

+						void *hPrivateMapData,

+						PVR2DMEMINFO **ppsDstMem);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,

+						PVR2DMEMINFO *psMemInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,

+					PVR2DBLTINFO *pBltInfo);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,

+						   PVR2DBLTINFO *pBltInfo,

+						   unsigned long ulNumClipRects,

+						   PVR2DRECT *pClipRects);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,

+								   PVR2DMEMINFO *pMemInfo,

+								   unsigned int uiWaitForComplete);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,

+										unsigned long ulPropertyMask,

+										long lSrcStride,

+										unsigned long ulDstWidth,

+										unsigned long ulDstHeight,

+										long lDstXPos,

+										long lDstYPos,

+										unsigned long ulNumClipRects,

+										PVR2DRECT *pClipRects,

+										unsigned long ulSwapInterval);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,

+						   PVR2DMEMINFO *pMemInfo,

+						   long lRenderID);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,

+								unsigned long ulFlags,

+								unsigned long ulNumBuffers,

+								unsigned long ulWidth,

+								unsigned long ulHeight,

+								PVR2DFORMAT eFormat,

+								long *plStride,

+								unsigned long *pulFlipChainID,

+								PVR2DFLIPCHAINHANDLE *phFlipChain);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,

+								 PVR2DFLIPCHAINHANDLE hFlipChain);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,

+									PVR2DFLIPCHAINHANDLE hFlipChain,

+									unsigned long *pulNumBuffers,

+									PVR2DMEMINFO *psMemInfo[]);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,

+										 PVR2DFLIPCHAINHANDLE hFlipChain,

+										 unsigned long ulPropertyMask,

+										 long lDstXPos,

+										 long lDstYPos,

+										 unsigned long ulNumClipRects, 

+										 PVR2DRECT *pClipRects,

+										 unsigned long ulSwapInterval);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,

+							PVR2DFLIPCHAINHANDLE hFlipChain,

+							PVR2DMEMINFO *psMemInfo,

+							long lRenderID);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char	*pUseCode,

+									const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);

+PVR2D_IMPORT

+PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);

+

+PVR2D_IMPORT

+PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);

+

+#ifdef __cplusplus

+}

+#endif 

+

+#endif /* _PVR2D_H_ */

+

+/******************************************************************************

+ End of file (pvr2d.h)

+******************************************************************************/

diff --git a/src/3rdparty/powervr/wsegl.h b/src/3rdparty/powervr/wsegl.h
new file mode 100644
index 0000000..e82c968
--- /dev/null
+++ b/src/3rdparty/powervr/wsegl.h
@@ -0,0 +1,240 @@
+/******************************************************************************

+ Name         : wsegl.h

+ Copyright    :	Copyright (c) Imagination Technologies Limited.

+				This specification is protected by copyright laws and contains

+				material proprietary to Imagination Technologies Limited.

+				You may use and distribute this specification free of charge for implementing 

+				the functionality therein, without altering or removing any trademark, copyright, 

+				or other notice from the specification.

+ Platform     : ANSI

+*****************************************************************************/

+

+

+#if !defined(__WSEGL_H__)

+#define __WSEGL_H__

+

+#ifdef __cplusplus

+extern "C" {

+#endif 

+

+/*

+// WSEGL Platform-specific definitions

+*/

+#define WSEGL_EXPORT

+#define WSEGL_IMPORT

+

+/*

+// WSEGL API Version Number

+*/

+

+#define WSEGL_VERSION 1

+#define WSEGL_DEFAULT_DISPLAY 0

+#define WSEGL_DEFAULT_NATIVE_ENGINE 0

+

+#define WSEGL_FALSE		0

+#define WSEGL_TRUE		1

+#define WSEGL_NULL		0

+

+#define	WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)

+

+/*

+// WSEGL handles

+*/

+typedef void *WSEGLDisplayHandle;

+typedef void *WSEGLDrawableHandle;

+

+/*

+// Display capability type

+*/

+typedef enum WSEGLCapsType_TAG

+{

+	WSEGL_NO_CAPS = 0,

+	WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */

+	WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */

+	WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */

+	WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */

+

+} WSEGLCapsType;

+

+/*

+// Display capability

+*/

+typedef struct WSEGLCaps_TAG

+{

+	WSEGLCapsType eCapsType;

+	unsigned long ui32CapsValue;

+

+} WSEGLCaps;

+

+/*

+// Drawable type

+*/

+#define WSEGL_NO_DRAWABLE			0x0

+#define WSEGL_DRAWABLE_WINDOW		0x1

+#define WSEGL_DRAWABLE_PIXMAP		0x2

+

+

+/*

+// Pixel format of display/drawable

+*/

+typedef enum WSEGLPixelFormat_TAG

+{

+	WSEGL_PIXELFORMAT_565 = 0,

+	WSEGL_PIXELFORMAT_4444 = 1,

+	WSEGL_PIXELFORMAT_8888 = 2,

+	WSEGL_PIXELFORMAT_1555 = 3

+

+} WSEGLPixelFormat;

+

+/*

+// Transparent of display/drawable

+*/

+typedef enum WSEGLTransparentType_TAG

+{

+	WSEGL_OPAQUE = 0,

+	WSEGL_COLOR_KEY = 1,

+

+} WSEGLTransparentType;

+

+/*

+// Display/drawable configuration

+*/

+typedef struct WSEGLConfig_TAG

+{

+	/*

+	// Type of drawables this configuration applies to -

+	// OR'd values of drawable types. 

+	*/

+	unsigned long ui32DrawableType;

+

+	/* Pixel format */

+	WSEGLPixelFormat ePixelFormat;

+

+	/* Native Renderable  - set to WSEGL_TRUE if native renderable */

+	unsigned long ulNativeRenderable;

+

+	/* FrameBuffer Level Parameter */

+	unsigned long ulFrameBufferLevel;

+

+	/* Native Visual ID */

+	unsigned long ulNativeVisualID;

+

+	/* Native Visual */

+	void *hNativeVisual;

+

+	/* Transparent Type */

+	WSEGLTransparentType eTransparentType;

+

+	/* Transparent Color - only used if transparent type is COLOR_KEY */

+	unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */

+

+

+} WSEGLConfig;

+

+/*

+// WSEGL errors

+*/

+typedef enum WSEGLError_TAG

+{

+	WSEGL_SUCCESS = 0,

+	WSEGL_CANNOT_INITIALISE = 1,

+	WSEGL_BAD_NATIVE_DISPLAY = 2,

+	WSEGL_BAD_NATIVE_WINDOW = 3,

+	WSEGL_BAD_NATIVE_PIXMAP = 4,

+	WSEGL_BAD_NATIVE_ENGINE = 5,

+	WSEGL_BAD_DRAWABLE = 6,

+	WSEGL_BAD_CONFIG = 7,

+	WSEGL_OUT_OF_MEMORY = 8

+

+} WSEGLError; 

+

+/*

+// Drawable orientation (in degrees anti-clockwise)

+*/

+typedef enum WSEGLRotationAngle_TAG

+{

+	WSEGL_ROTATE_0 = 0,

+	WSEGL_ROTATE_90 = 1,

+	WSEGL_ROTATE_180 = 2,

+	WSEGL_ROTATE_270 = 3

+

+} WSEGLRotationAngle; 

+

+/*

+// Drawable information required by OpenGL-ES driver

+*/

+typedef struct WSEGLDrawableParams_TAG

+{

+	/* Width in pixels of the drawable */

+	unsigned long	ui32Width;

+

+	/* Height in pixels of the drawable */

+	unsigned long	ui32Height;

+

+	/* Stride in pixels of the drawable */

+	unsigned long	ui32Stride;

+

+	/* Pixel format of the drawable */

+	WSEGLPixelFormat	ePixelFormat;

+

+	/* User space cpu virtual address of the drawable */

+	void   			*pvLinearAddress;

+

+	/* HW address of the drawable */

+	unsigned long	ui32HWAddress;

+

+	/* Private data for the drawable */

+	void			*hPrivateData;

+

+} WSEGLDrawableParams;

+

+

+/*

+// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()

+//

+// The first entry in the table is the version number of the wsegl.h header file that

+// the module has been written against, and should therefore be set to WSEGL_VERSION

+*/

+typedef struct WSEGL_FunctionTable_TAG

+{

+	unsigned long ui32WSEGLVersion;

+

+	WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);

+

+	WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);

+

+	WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);

+

+	WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);

+

+	WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);

+

+	WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);

+

+	WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);

+

+	WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);

+

+	WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);

+

+	WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);

+

+	WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);

+

+	WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);

+

+

+} WSEGL_FunctionTable;

+

+

+WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);

+

+#ifdef __cplusplus

+}

+#endif 

+

+#endif /* __WSEGL_H__ */

+

+/******************************************************************************

+ End of file (wsegl.h)

+******************************************************************************/

diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp
index 46ac1d1..e22ea1f 100644
--- a/src/gui/embedded/qscreentransformed_qws.cpp
+++ b/src/gui/embedded/qscreentransformed_qws.cpp
@@ -400,7 +400,19 @@ void QTransformedScreen::blit(const QImage &image, const QPoint &topLeft,
 #endif
 #if defined(QT_QWS_DEPTH_16) || defined(QT_QWS_DEPTH_15) || defined(QT_QWS_DEPTH_12)
     case 16:
+#if defined QT_QWS_ROTATE_BGR
+        if (pixelType() == BGRPixel && image.depth() == 16) {
+            SET_BLIT_FUNC(qbgr565, quint16, trans, func);
+            break;
+        } //fall-through here!!!
+#endif
     case 15:
+#if defined QT_QWS_ROTATE_BGR
+        if (pixelType() == BGRPixel && image.format() == QImage::Format_RGB555) {
+            SET_BLIT_FUNC(qbgr555, qrgb555, trans, func);
+            break;
+        } //fall-through here!!!
+#endif
     case 12:
         if (image.depth() == 16)
             SET_BLIT_FUNC(quint16, quint16, trans, func);
diff --git a/src/gui/embedded/qscreenvfb_qws.cpp b/src/gui/embedded/qscreenvfb_qws.cpp
index abbe73b..accfe1f 100644
--- a/src/gui/embedded/qscreenvfb_qws.cpp
+++ b/src/gui/embedded/qscreenvfb_qws.cpp
@@ -310,6 +310,9 @@ bool QVFbScreen::connect(const QString &displaySpec)
 
     connected = this;
 
+    if (qgetenv("QT_QVFB_BGR").toInt())
+        pixeltype = BGRPixel;
+
     return true;
 }
 
diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp
index 4058143..471f544 100644
--- a/src/gui/painting/qmemrotate.cpp
+++ b/src/gui/painting/qmemrotate.cpp
@@ -528,6 +528,26 @@ void qt_memrotate270(const srctype *src, int w, int h, int sstride, \
     qt_memrotate270_template(src, w, h, sstride, dest, dstride);    \
 }
 
+#define QT_IMPL_SIMPLE_MEMROTATE(srctype, desttype)                 \
+void qt_memrotate90(const srctype *src, int w, int h, int sstride,  \
+                    desttype *dest, int dstride)                    \
+{                                                                   \
+    qt_memrotate90_tiled_unpacked<desttype,srctype>(src, w, h, sstride, dest, dstride); \
+}                                                                   \
+void qt_memrotate180(const srctype *src, int w, int h, int sstride, \
+                     desttype *dest, int dstride)                   \
+{                                                                   \
+    qt_memrotate180_template(src, w, h, sstride, dest, dstride);    \
+}                                                                   \
+void qt_memrotate270(const srctype *src, int w, int h, int sstride, \
+                     desttype *dest, int dstride)                   \
+{                                                                   \
+    qt_memrotate270_tiled_unpacked<desttype,srctype>(src, w, h, sstride, dest, dstride); \
+}
+
+
+
+
 QT_IMPL_MEMROTATE(quint32, quint32)
 QT_IMPL_MEMROTATE(quint32, quint16)
 QT_IMPL_MEMROTATE(quint16, quint32)
@@ -539,6 +559,14 @@ QT_IMPL_MEMROTATE(quint32, quint8)
 QT_IMPL_MEMROTATE(quint16, quint8)
 QT_IMPL_MEMROTATE(qrgb444, quint8)
 QT_IMPL_MEMROTATE(quint8, quint8)
+
+#if defined(QT_QWS_ROTATE_BGR)
+QT_IMPL_SIMPLE_MEMROTATE(quint16, qbgr565)
+QT_IMPL_SIMPLE_MEMROTATE(quint32, qbgr565)
+QT_IMPL_SIMPLE_MEMROTATE(qrgb555, qbgr555)
+QT_IMPL_SIMPLE_MEMROTATE(quint32, qbgr555)
+#endif
+
 #ifdef QT_QWS_DEPTH_GENERIC
 QT_IMPL_MEMROTATE(quint32, qrgb_generic16)
 QT_IMPL_MEMROTATE(quint16, qrgb_generic16)
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index c1eb93e..87cfb1a 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -92,6 +92,14 @@ QT_DECL_MEMROTATE(quint32, quint8);
 QT_DECL_MEMROTATE(quint16, quint8);
 QT_DECL_MEMROTATE(qrgb444, quint8);
 QT_DECL_MEMROTATE(quint8, quint8);
+
+#ifdef QT_QWS_ROTATE_BGR
+QT_DECL_MEMROTATE(quint16, qbgr565);
+QT_DECL_MEMROTATE(quint32, qbgr565);
+QT_DECL_MEMROTATE(qrgb555, qbgr555);
+QT_DECL_MEMROTATE(quint32, qbgr555);
+#endif
+
 #ifdef QT_QWS_DEPTH_GENERIC
 QT_DECL_MEMROTATE(quint32, qrgb_generic16);
 QT_DECL_MEMROTATE(quint16, qrgb_generic16);
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
index 0644a02..5889388 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/src/gui/painting/qpaintengine_mac.cpp
@@ -996,15 +996,14 @@ void QCoreGraphicsPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, co
     } else if (differentSize) {
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
         if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
-            CGImageRef img = (CGImageRef)pm.macCGHandle();
+            QCFType<CGImageRef> img = pm.toMacCGImageRef();
             image = CGImageCreateWithImageInRect(img, CGRectMake(qRound(sr.x()), qRound(sr.y()), qRound(sr.width()), qRound(sr.height())));
-            CGImageRelease(img);
         } else
 #endif
         {
             const int sx = qRound(sr.x()), sy = qRound(sr.y()), sw = qRound(sr.width()), sh = qRound(sr.height());
             const QMacPixmapData *pmData = static_cast<const QMacPixmapData*>(pm.data);
-            quint32 *pantherData = pmData->pixels + (sy * pm.width() + sx);
+            quint32 *pantherData = pmData->pixels + sy * (pmData->bytesPerRow / 4) + sx;
             QCFType<CGDataProviderRef> provider = CGDataProviderCreateWithData(0, pantherData, sw*sh*pmData->bytesPerRow, 0);
             image = CGImageCreate(sw, sh, 8, 32, pmData->bytesPerRow,
                                   macGenericColorSpace(),
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index ba1e27c..788b722 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1022,7 +1022,7 @@ void QRasterPaintEnginePrivate::drawImage(const QPointF &pt,
                                           int alpha,
                                           const QRect &sr)
 {
-    if (!clip.isValid())
+    if (alpha == 0 || !clip.isValid())
         return;
     Q_ASSERT(img.depth() >= 8);
 
@@ -2664,7 +2664,13 @@ void QRasterPaintEngine::drawImage(const QRectF &r, const QImage &img, const QRe
 
         QRectF rr = r;
         rr.translate(s->matrix.dx(), s->matrix.dy());
-        fillRect_normalized(toRect_normalized(rr), &d->image_filler, d);
+
+        const int x1 = qRound(rr.x());
+        const int y1 = qRound(rr.y());
+        const int x2 = qRound(rr.right());
+        const int y2 = qRound(rr.bottom());
+
+        fillRect_normalized(QRect(x1, y1, x2-x1, y2-y1), &d->image_filler, d);
     }
 }
 
@@ -5147,7 +5153,11 @@ void QSpanData::adjustSpanMethods()
 
 void QSpanData::setupMatrix(const QTransform &matrix, int bilin)
 {
-    QTransform inv = matrix.inverted();
+    QTransform delta;
+    // make sure we round off correctly in qdrawhelper.cpp
+    delta.translate(1.0 / 65536, 1.0 / 65536);
+
+    QTransform inv = (delta * matrix).inverted();
     m11 = inv.m11();
     m12 = inv.m12();
     m13 = inv.m13();
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 759bd7e..afc4211 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5142,6 +5142,11 @@ void QPainter::drawConvexPolygon(const QPointF *points, int pointCount)
     d->engine->drawPolygon(points, pointCount, QPaintEngine::ConvexMode);
 }
 
+static inline QPointF roundInDeviceCoordinates(const QPointF &p, const QTransform &m)
+{
+    return m.inverted().map(QPointF(m.map(p).toPoint()));
+}
+
 /*!
     \fn void QPainter::drawPixmap(const QRectF &target, const QPixmap &pixmap, const QRectF &source)
 
@@ -5210,11 +5215,12 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm)
         || (d->state->opacity != 1.0 && !d->engine->hasFeature(QPaintEngine::ConstantOpacity)))
     {
         save();
-        // If there is no scaling or transformation involved we have to make sure we use the
+        // If there is no rotation involved we have to make sure we use the
         // antialiased and not the aliased coordinate system by rounding the coordinates.
-        if (d->state->matrix.type() <= QTransform::TxTranslate) {
-            x = qRound(x + d->state->matrix.dx()) - d->state->matrix.dx();
-            y = qRound(y + d->state->matrix.dy()) - d->state->matrix.dy();
+        if (d->state->matrix.type() <= QTransform::TxScale) {
+            const QPointF p = roundInDeviceCoordinates(QPointF(x, y), d->state->matrix);
+            x = p.x();
+            y = p.y();
         }
         translate(x, y);
         setBackgroundMode(Qt::TransparentMode);
@@ -5324,16 +5330,21 @@ void QPainter::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
         || ((sw != w || sh != h) && !d->engine->hasFeature(QPaintEngine::PixmapTransform)))
     {
         save();
-        // If there is no scaling or transformation involved we have to make sure we use the
+        // If there is no rotation involved we have to make sure we use the
         // antialiased and not the aliased coordinate system by rounding the coordinates.
+        if (d->state->matrix.type() <= QTransform::TxScale) {
+            const QPointF p = roundInDeviceCoordinates(QPointF(x, y), d->state->matrix);
+            x = p.x();
+            y = p.y();
+        }
+
         if (d->state->matrix.type() <= QTransform::TxTranslate && sw == w && sh == h) {
-            x = qRound(x + d->state->matrix.dx()) - d->state->matrix.dx();
-            y = qRound(y + d->state->matrix.dy()) - d->state->matrix.dy();
             sx = qRound(sx);
             sy = qRound(sy);
             sw = qRound(sw);
             sh = qRound(sh);
         }
+
         translate(x, y);
         scale(w / sw, h / sh);
         setBackgroundMode(Qt::TransparentMode);
@@ -5483,11 +5494,12 @@ void QPainter::drawImage(const QPointF &p, const QImage &image)
         || (d->state->opacity != 1.0 && !d->engine->hasFeature(QPaintEngine::ConstantOpacity)))
     {
         save();
-        // If there is no scaling or transformation involved we have to make sure we use the
+        // If there is no rotation involved we have to make sure we use the
         // antialiased and not the aliased coordinate system by rounding the coordinates.
-        if (d->state->matrix.type() <= QTransform::TxTranslate) {
-            x = qRound(x + d->state->matrix.dx()) - d->state->matrix.dx();
-            y = qRound(y + d->state->matrix.dy()) - d->state->matrix.dy();
+        if (d->state->matrix.type() <= QTransform::TxScale) {
+            const QPointF p = roundInDeviceCoordinates(QPointF(x, y), d->state->matrix);
+            x = p.x();
+            y = p.y();
         }
         translate(x, y);
         setBackgroundMode(Qt::TransparentMode);
@@ -5586,11 +5598,15 @@ void QPainter::drawImage(const QRectF &targetRect, const QImage &image, const QR
         || (d->state->opacity != 1.0 && !d->engine->hasFeature(QPaintEngine::ConstantOpacity)))
     {
         save();
-        // If there is no scaling or transformation involved we have to make sure we use the
+        // If there is no rotation involved we have to make sure we use the
         // antialiased and not the aliased coordinate system by rounding the coordinates.
+        if (d->state->matrix.type() <= QTransform::TxScale) {
+            const QPointF p = roundInDeviceCoordinates(QPointF(x, y), d->state->matrix);
+            x = p.x();
+            y = p.y();
+        }
+
         if (d->state->matrix.type() <= QTransform::TxTranslate && sw == w && sh == h) {
-            x = qRound(x + d->state->matrix.dx()) - d->state->matrix.dx();
-            y = qRound(y + d->state->matrix.dy()) - d->state->matrix.dy();
             sx = qRound(sx);
             sy = qRound(sy);
             sw = qRound(sw);
@@ -6333,17 +6349,18 @@ void QPainter::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPo
         setBrush(QBrush(d->state->pen.color(), pixmap));
         setPen(Qt::NoPen);
 
-        // If there is no scaling or transformation involved we have to make sure we use the
+        // If there is no rotation involved we have to make sure we use the
         // antialiased and not the aliased coordinate system by rounding the coordinates.
-        if (d->state->matrix.type() <= QTransform::TxTranslate) {
-            qreal x = qRound(r.x() + d->state->matrix.dx()) - d->state->matrix.dx();
-            qreal y = qRound(r.y() + d->state->matrix.dy()) - d->state->matrix.dy();
-            qreal w = qRound(r.width());
-            qreal h = qRound(r.height());
-            sx = qRound(sx);
-            sy = qRound(sy);
+        if (d->state->matrix.type() <= QTransform::TxScale) {
+            const QPointF p = roundInDeviceCoordinates(r.topLeft(), d->state->matrix);
+
+            if (d->state->matrix.type() <= QTransform::TxTranslate) {
+                sx = qRound(sx);
+                sy = qRound(sy);
+            }
+
             setBrushOrigin(QPointF(r.x()-sx, r.y()-sy));
-            drawRect(QRectF(x, y, w, h));
+            drawRect(QRectF(p, r.size()));
         } else {
             setBrushOrigin(QPointF(r.x()-sx, r.y()-sy));
             drawRect(r);
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/QWSWSEGL.pro b/src/plugins/gfxdrivers/powervr/QWSWSEGL/QWSWSEGL.pro
index b62894d..9331d0a 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/QWSWSEGL.pro
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/QWSWSEGL.pro
@@ -22,3 +22,5 @@ LIBS += -lpvr2d
 DESTDIR = $$QMAKE_LIBDIR_QT
 target.path = $$[QT_INSTALL_LIBS]
 INSTALLS += target
+
+include(../powervr.pri)
\ No newline at end of file
diff --git a/src/plugins/gfxdrivers/powervr/README b/src/plugins/gfxdrivers/powervr/README
index ec02efb..4dce87f 100644
--- a/src/plugins/gfxdrivers/powervr/README
+++ b/src/plugins/gfxdrivers/powervr/README
@@ -29,12 +29,13 @@ strictly Unix-style markers.
 
 ***************************************************************************
 * IMPORTANT: To build the QScreen plugin and the WSEGL library it depends *
-* on, the pvr2d.h, wsegl.h headers for your platform are required. These  *
-* can be obtained either through your platform provider or directly from  *
-* Imagination Technologies.                                               *
+* on, the pvr2d.h, wsegl.h headers for your platform are required.  You   *
+* can find a copy of these headers in src/3rdparty/powervr for SGX based  *
+* platforms like the TI OMAP3xxx. They may also work on MBX platforms too *
+* depending on how old your libEGL is. You can tell Qt where to find      *
+* these headers by setting QMAKE_INCDIR_POWERVR in the mkspec.            *
 ***************************************************************************
 
-
 When you start a Qt/Embedded application, you should modify the QWS_DISPLAY
 environment variable to use the "powervr" driver instead of "LinuxFb".  For
 example, if your original QWS_DISPLAY variable was:
diff --git a/src/plugins/gfxdrivers/powervr/powervr.pri b/src/plugins/gfxdrivers/powervr/powervr.pri
new file mode 100644
index 0000000..9df8c0e
--- /dev/null
+++ b/src/plugins/gfxdrivers/powervr/powervr.pri
@@ -0,0 +1,2 @@
+
+INCLUDEPATH += $$QMAKE_INCDIR_POWERVR
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro
index 691cd2d..675be85 100644
--- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro
+++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro
@@ -9,9 +9,10 @@ DEFINES += QT_QWS_CLIENTBLIT
 
 INCLUDEPATH += ../QWSWSEGL
 
+
 HEADERS	= \
-	pvreglscreen.h \
-        pvreglwindowsurface.h
+    pvreglscreen.h \
+    pvreglwindowsurface.h
 
 SOURCES	= \
         pvreglscreenplugin.cpp \
@@ -22,3 +23,5 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers
 
 target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers
 INSTALLS += target
+
+include(../powervr.pri)
\ No newline at end of file
diff --git a/tests/arthur/common/images.qrc b/tests/arthur/common/images.qrc
index 8e94760..060b52c 100644
--- a/tests/arthur/common/images.qrc
+++ b/tests/arthur/common/images.qrc
@@ -3,6 +3,7 @@
 <qresource>
    <file>images/alpha.png</file>
    <file>images/border.png</file>
+   <file>images/borderimage.png</file>
    <file>images/dome_argb32.png</file>
    <file>images/dome_indexed.png</file>
    <file>images/dome_mono_palette.png</file>
diff --git a/tests/arthur/common/images/borderimage.png b/tests/arthur/common/images/borderimage.png
new file mode 100644
index 0000000..f7f6b66
--- /dev/null
+++ b/tests/arthur/common/images/borderimage.png
diff --git a/tests/arthur/data/qps/borderimage.qps b/tests/arthur/data/qps/borderimage.qps
new file mode 100644
index 0000000..747a74d
--- /dev/null
+++ b/tests/arthur/data/qps/borderimage.qps
@@ -0,0 +1,129 @@
+image_load borderimage.png borderimage
+
+translate -128 -128
+begin_block draw_border
+
+# top
+drawImage borderimage   0   0  16  16   0   0  16  16
+drawImage borderimage  16   0  36  16  16   0  32  16
+drawImage borderimage  52   0  16  16  48   0  16  16
+
+# sides
+drawImage borderimage   0  16  16  16   0  16  16  32
+drawImage borderimage  52  16  16  16  48  16  16  32
+
+#bottom
+drawImage borderimage   0  32  16  16   0  48  16  16
+drawImage borderimage  16  32  36  16  16  48  32  16
+drawImage borderimage  52  32  16  16  48  48  16  16
+
+end_block draw_border
+
+resetMatrix
+
+begin_block draw_column
+
+translate 1 1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+translate 0.1 64.1
+repeat_block draw_border
+
+end_block draw_column
+
+setRenderHint Antialiasing
+
+resetMatrix
+translate 72 0
+
+repeat_block draw_column
+
+resetMatrix
+scale 1.25 1.25
+translate 144 0
+
+repeat_block draw_border
+
+resetMatrix
+scale 1.25 1.25
+translate 246 0
+rotate 30
+
+repeat_block draw_border
+
+setRenderHint SmoothPixmapTransform
+
+resetMatrix
+scale 1.25 1.25
+translate 144 120
+
+repeat_block draw_border
+
+resetMatrix
+scale 1.25 1.25
+translate 246 120
+rotate 30
+
+repeat_block draw_border
+
+resetMatrix
+translate 215 260
+scale 3.55 3.55
+rotate 30
+
+repeat_block draw_border
+
+resetMatrix
+setRenderHint SmoothPixmapTransform off
+setRenderHint Antialiasing off
+
+translate 480 627
+rotate 180
+repeat_block draw_column
+
+resetMatrix
+setRenderHint Antialiasing
+
+translate 552 627
+rotate 180
+repeat_block draw_column
+
+resetMatrix
+setRenderHint Antialiasing off
+
+setPen red
+
+drawRect 0 0 70 680
+drawText 10 670 "aa off"
+
+drawRect 72 0 70 680
+drawText 80 670 "aa on"
+
+drawRect 409 0 70 680
+drawText 419 650 "rot 180"
+drawText 419 670 "aa off"
+
+drawRect 481 0 70 680
+drawText 491 650 "rot 180"
+drawText 491 670 "aa on"
+
+drawRect 164 0 224 124
+drawText 174 114 "smoothpixmaptransform off"
+
+drawRect 164 128 224 134
+drawText 174 252 "smoothpixmaptransform on"
diff --git a/tests/arthur/data/qps/borderimage_qps.png b/tests/arthur/data/qps/borderimage_qps.png
new file mode 100644
index 0000000..89a8eba
--- /dev/null
+++ b/tests/arthur/data/qps/borderimage_qps.png
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index c81bf67..87f9c13 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -225,6 +225,8 @@ private slots:
 
     void extendedBlendModes();
 
+    void zeroOpacity();
+
 private:
     void fillData();
     QColor baseColor( int k, int intensity=255 );
@@ -4150,5 +4152,21 @@ void tst_QPainter::extendedBlendModes()
     QVERIFY(testCompositionMode(191, 191,  96, QPainter::CompositionMode_Exclusion));
 }
 
+void tst_QPainter::zeroOpacity()
+{
+    QImage source(1, 1, QImage::Format_ARGB32_Premultiplied);
+    source.fill(0xffffffff);
+
+    QImage target(1, 1, QImage::Format_RGB32);
+    target.fill(0xff000000);
+
+    QPainter p(&target);
+    p.setOpacity(0.0);
+    p.drawImage(0, 0, source);
+    p.end();
+
+    QCOMPARE(target.pixel(0, 0), 0xff000000);
+}
+
 QTEST_MAIN(tst_QPainter)
 #include "tst_qpainter.moc"