summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorSarah Smith <sarah.j.smith@nokia.com>2011-12-21 14:45:00 +1000
committerSarah Jane Smith <sarah.j.smith@nokia.com>2011-12-21 08:57:36 +0100
commitaedf27c0aa3e3d037392335ea96d37e3a9a8b811 (patch)
treefec10b3fff19f2cb6e0d3640d73a4ebb7a1fe804 /src/plugins
parenta7db0a7405e3511ef8a78f0ff1cdb3b1ecd92157 (diff)
Make Qt3D buildable without widgets or opengl.
Pull out all references to QGLContext, and QGLWidget and so on; and replace with the equivalent from the gui library. Where there is no equivalent, eg the BindOptions enum, then reimplement. Also get rid of the harmattan and symbian packaging goop. This had become completely unmaintainable, and was making it very hard to see what dependencies were being pull in by the various parts of the build system. In order to have any confidence that conditional compilation would not add in some problematic dependency, clean all this up. Task-number: QTBUG-23299 Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sceneformats/3ds/qgl3dsmesh.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sceneformats/3ds/qgl3dsmesh.cpp b/src/plugins/sceneformats/3ds/qgl3dsmesh.cpp
index a09361242..9913b4d28 100644
--- a/src/plugins/sceneformats/3ds/qgl3dsmesh.cpp
+++ b/src/plugins/sceneformats/3ds/qgl3dsmesh.cpp
@@ -656,7 +656,7 @@ void QGL3dsMesh::checkTextures(int material)
// all texture coordinates from 3ds have to be flipped because
// 3ds uses the correct coordinate system, whilst qt uses
// upside-down coordinates
- m_texFlip = (tex->bindOptions() & QGLContext::InvertedYBindOption) == 0;
+ m_texFlip = (tex->bindOptions() & QGLTexture2D::InvertedYBindOption) == 0;
}
}