diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-04 09:26:33 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-04 09:26:33 (GMT) |
| commit | 95c0a8de7af1e631485117f5764f4e2677ec6d0b (patch) | |
| tree | 9f1fd8726b7f33a6958f3cf395c3ea1300c2d580 /demos | |
| parent | a800e1d5e7fa69a3bfa21d74c5db47f5a41ed65c (diff) | |
| parent | 397c3bb494e220af5ef1cf6e47cfdfc84b61540b (diff) | |
| download | Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.zip Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.tar.gz Qt-95c0a8de7af1e631485117f5764f4e2677ec6d0b.tar.bz2 | |
Merge commit 'mainline/master' into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/boxes/glbuffers.h | 2 | ||||
| -rw-r--r-- | demos/boxes/scene.cpp | 2 | ||||
| -rw-r--r-- | demos/boxes/scene.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h index 392924e..9e05fad 100644 --- a/demos/boxes/glbuffers.h +++ b/demos/boxes/glbuffers.h @@ -58,7 +58,9 @@ if (m_failed || !(assertion)) { returnStatement; \ } +QT_BEGIN_NAMESPACE class QMatrix4x4; +QT_END_NAMESPACE class GLTexture { diff --git a/demos/boxes/scene.cpp b/demos/boxes/scene.cpp index e2aa16b..2376782 100644 --- a/demos/boxes/scene.cpp +++ b/demos/boxes/scene.cpp @@ -559,7 +559,7 @@ void Scene::initGL() << ":/res/boxes/cubemap_negy.jpg" << ":/res/boxes/cubemap_posz.jpg" << ":/res/boxes/cubemap_negz.jpg"; m_environment = new GLTextureCube(list, qMin(1024, m_maxTextureSize)); m_environmentShader = new QGLShader(QGLShader::FragmentShader); - m_environmentShader->setSourceCode(environmentShaderText); + m_environmentShader->compile(environmentShaderText); m_environmentProgram = new QGLShaderProgram; m_environmentProgram->addShader(m_vertexShader); m_environmentProgram->addShader(m_environmentShader); diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index 48ecaba..9f8d2af 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -56,7 +56,10 @@ #define PI 3.14159265358979 +QT_BEGIN_NAMESPACE class QMatrix4x4; +QT_END_NAMESPACE + class ParameterEdit : public QWidget { public: |