added guard against linking qt5 and VTK together
modified viz module header layout for 2.4 compatibility
Merge pull request #2269 from Nerei:qt5_vtk_guards
UMat: issue in OpenCLAllocator::unmap()