Qt: Mac arch detection workaround on Qt4. Fix a conflict.
Symbian buildfix, x11 linker order
Don't update render tex x/y offset unless matched.

Sometimes we have false matches, they should be skipped.  Fixes some bloom
that is off in some games.
Qt: Prevent unexpected bitness override on Mac.
Match block transfer address even when uncached.

Rhythm8 for example uses an uncached address for the dest framebuffer.
Avoid corrupting mem if our framebuf size is wrong.

Let the size specify the framebuffer height, which we are most likely to
have gotten wrong.
Add a matching PerformMemoryUpload().

Just so we have both Download and Upload to use later.
Remove some unnecessary #ifdef's relating to Symbian.
Bring back some ifdefs
Update Symbian to GCC 4.8.3
Disable precision qualifiers on desktop GL
Merge pull request #6287 from hrydgard/desktop-shader-precision

Disable precision qualifiers on desktop GL
Revert "Remove option" (disable alpha test)

Fixes issue #6286.

This reverts commit d2ce635bbfbf2a68517ed7eac10b3923d0f3c3c8.
Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native