diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 04:37:41 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 04:37:41 (GMT) |
| commit | efe66141d535d1741f302efff9248db726cd66b1 (patch) | |
| tree | a495722170c03ab9ee27b9cdc347c13a9d9e61f3 /doc/src/examples/activeqt/opengl.qdoc | |
| parent | 89a2087b7ec5e36f7f4dd16d942aa23d2c7a6042 (diff) | |
| parent | 07d2ce1e6df9f2b5b9c3263741f9a8f160cdbc80 (diff) | |
| download | Qt-efe66141d535d1741f302efff9248db726cd66b1.zip Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.gz Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/corelib/kernel/qobject_p.h
Diffstat (limited to 'doc/src/examples/activeqt/opengl.qdoc')
| -rw-r--r-- | doc/src/examples/activeqt/opengl.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/activeqt/opengl.qdoc b/doc/src/examples/activeqt/opengl.qdoc index ac1e3b9..d7eaf9c 100644 --- a/doc/src/examples/activeqt/opengl.qdoc +++ b/doc/src/examples/activeqt/opengl.qdoc @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -57,7 +57,7 @@ <p /> An OpenGL scene:<br /> <object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0" - CODEBASE="http://qtsoftware.com/demos/openglax.cab"> + CODEBASE="http://qt.nokia.com/demos/openglax.cab"> [Object not available! Did you forget to build and register the server?] </object><br /> |