From 19e9fd70bb39c10b69eb6220c2d5b772e126324c Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Mon, 4 Jul 2011 16:16:32 +0200 Subject: Committing the qt-webpages.qdoc file with the online links Reviewed-by: David Boddie --- doc/src/qt-webpages.qdoc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc index 208814b..c993575 100644 --- a/doc/src/qt-webpages.qdoc +++ b/doc/src/qt-webpages.qdoc @@ -209,7 +209,7 @@ \title Qt Docs Web Start Page */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-qml-application.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-qml-application.html \title external: Developing Qt Quick Applications with Creator */ /*! @@ -233,35 +233,35 @@ \title Qt Whitepaper */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-visual-editor.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-visual-editor.html \title external: Developing Qt Quick Applications */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-publish-ovi.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-publish-ovi.html \title external: Publishing Applications to Ovi Store */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/index.html + \externalpage http://doc.qt.nokia.com/qtcreator/index.html \title external: Qt Creator Manual */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-developing-symbian.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-developing-symbian.html \title external: Setting Up Development Environment for Symbian */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-developing-maemo.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-developing-maemo.html \title external: Setting Up Development Environment for Maemo */ /*! - \externalpage qthelp://com.nokia.qtmobility.111/mobility/index.html + \externalpage http://doc.qt.nokia.com/qtmobility/index.html \title external: Qt Mobility Manual */ /*! - \externalpage qthelp://com.nokia.qtmobility.111/mobility/qml-plugins.html + \externalpage http://doc.qt.nokia.com/qtmobility/qml-plugins.html \title external: Qt Mobility QML Plugins */ /*! - \externalpage qthelp://com.nokia.qt.simulator.110/doc/index.html + \externalpage http://doc.qt.nokia.com/qtsimulator/index.html \title external: Qt Simulator Manual */ /*! @@ -269,51 +269,51 @@ \title Qt SDK Product Page */ /*! - \externalpage qthelp://com.nokia.qt.sdk.11/doc/index.html + \externalpage http://doc.qt.nokia.com/nokia-qtsdk-latest/index.html \title external: Qt SDK Manual */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-project-managing.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-project-managing.html \title external: Creating Qt Projects in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-building-running.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-building-running.html \title external: Building and Running Applications in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-running-targets.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-running-targets.html \title external: Set Compiler Targets in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-build-settings.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-build-settings.html \title external: Build Settings in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-run-settings.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-run-settings.html \title external: Run Settings in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-using-qt-designer.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-using-qt-designer.html \title external: Designer in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-debugging.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-debugging.html \title external: Debugging Applications in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-deployment-symbian.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-deployment-symbian.html \title external: Symbian Deployment in Creator */ /*! - \externalpage qthelp://com.nokia.qtcreator.221/doc/creator-deployment-maemo.html + \externalpage http://doc.qt.nokia.com/qtcreator/creator-deployment-maemo.html \title external: Maemo Deployment in Creator */ /*! - \externalpage qthelp://com.nokia.qtmobility.111/mobility/multimedia.html + \externalpage http://doc.qt.nokia.com/qtmobility/multimedia.html \title external: Mobility Multimedia */ /*! - \externalpage qthelp://com.nokia.qtmobility.111/mobility/location-overview.html + \externalpage http://doc.qt.nokia.com/qtmobility/location-overview.html \title external: Mobility Location */ /*! @@ -329,7 +329,7 @@ \title Training Day at Qt Developer Days 2009 */ /*! - \externalpage qthelp://com.nokia.qtmobility.111/mobility/all-examples.html + \externalpage http://doc.qt.nokia.com/qtmobility/all-examples.html \title external: Qt Mobility Examples */ /*! -- cgit v0.12 From 25bbcf9605f65548d7f581304b7d8ad300aa9937 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 4 Jul 2011 16:44:29 +0200 Subject: Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase. --- examples/opengl/cube/geometryengine.cpp | 2 ++ examples/opengl/cube/mainwidget.cpp | 2 ++ examples/opengl/cube/mainwidget.h | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp index 3001ed5..c05dde5 100644 --- a/examples/opengl/cube/geometryengine.cpp +++ b/examples/opengl/cube/geometryengine.cpp @@ -61,6 +61,8 @@ GeometryEngine::~GeometryEngine() void GeometryEngine::init() { + initializeGLFunctions(); + //! [0] // Generate 2 VBOs glGenBuffers(2, vboIds); diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp index 2a2cd63..1116526 100644 --- a/examples/opengl/cube/mainwidget.cpp +++ b/examples/opengl/cube/mainwidget.cpp @@ -118,6 +118,8 @@ void MainWidget::timerEvent(QTimerEvent *e) void MainWidget::initializeGL() { + initializeGLFunctions(); + qglClearColor(Qt::black); qDebug() << "Initializing shaders..."; diff --git a/examples/opengl/cube/mainwidget.h b/examples/opengl/cube/mainwidget.h index 33ab0d8..c6da29f 100644 --- a/examples/opengl/cube/mainwidget.h +++ b/examples/opengl/cube/mainwidget.h @@ -42,6 +42,7 @@ #define MAINWIDGET_H #include +#include #include #include @@ -52,7 +53,7 @@ class QGLShaderProgram; class GeometryEngine; -class MainWidget : public QGLWidget +class MainWidget : public QGLWidget, protected QGLFunctions { Q_OBJECT public: -- cgit v0.12