MSVC/OpenGL: Fix warnings about macro redefinition..
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Mon, 27 Aug 2012 09:47:01 +0000 (11:47 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 30 Aug 2012 11:51:22 +0000 (13:51 +0200)
commit711689fef98d6768120a5a5df08b6db9f98a0a2b
tree95792c32430b56d04af29f1691e0f7b4e99cc675
parent634c39c1a950d1883e80b39989fbe3ccb517d124
MSVC/OpenGL: Fix warnings about macro redefinition..

Introduced by fc41ee4c92ce703f3e4374bf493505a1d847a657 .

Change-Id: I4c924b0b0a38401ab02c3cc4edb7d78dbd9ef356
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/gui/opengl/qopenglshaderprogram.h
src/opengl/qglshaderprogram.h