diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-04 13:37:56 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-04 13:37:56 (GMT) |
| commit | 2dcbb2efac5f5722e1980c01dd8ec0adaec114f3 (patch) | |
| tree | efb397c1e114ef145451b985ad490f3b8482b184 /demos | |
| parent | 30971fa4ffaeb4c2a3a1267cca73311fb9834241 (diff) | |
| parent | 95c0a8de7af1e631485117f5764f4e2677ec6d0b (diff) | |
| download | Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.zip Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.tar.gz Qt-2dcbb2efac5f5722e1980c01dd8ec0adaec114f3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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: |