diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-09 20:32:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 20:01:27 +0200 |
| commit | f4f6597e28a8a01ba0cbc4f346f481928d48fdec (patch) | |
| tree | 450a373fa99499d90ed3dfd72b64bd8c404d6efd /tools | |
| parent | 3ecbd9f301a66c2733b28aa4ca2d9947efa67bcd (diff) | |
fix compile after numerous reshufflings in qtbase
Change-Id: I62f3d32f326fbab483362ec2a2aad146314570fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qt3d/qglinfo/fpswidget.h | 2 | ||||
| -rw-r--r-- | tools/qt3d/qglinfo/qglinfo.cpp | 4 | ||||
| -rw-r--r-- | tools/qt3d/qglinfo/qglinfo.pro | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/qt3d/qglinfo/fpswidget.h b/tools/qt3d/qglinfo/fpswidget.h index b7dac1dd5..8b0703e93 100644 --- a/tools/qt3d/qglinfo/fpswidget.h +++ b/tools/qt3d/qglinfo/fpswidget.h @@ -46,7 +46,7 @@ #if defined(QT_OPENGL_ES_2) #include <QtGui/qvector3d.h> #include <QtGui/qmatrix4x4.h> -#include <QOpenGLShaderProgram> +#include <QtOpenGL/QGLShaderProgram> #endif class QTime; diff --git a/tools/qt3d/qglinfo/qglinfo.cpp b/tools/qt3d/qglinfo/qglinfo.cpp index 3d8966c36..2387bd0ae 100644 --- a/tools/qt3d/qglinfo/qglinfo.cpp +++ b/tools/qt3d/qglinfo/qglinfo.cpp @@ -41,10 +41,10 @@ #include "qglinfo.h" +#include <QtGui/qopenglframebufferobject.h> #include <QtOpenGL/qgl.h> #include <QtOpenGL/qglpixelbuffer.h> -#include <QtOpenGL/qglframebufferobject.h> -#include <QOpenGLShaderProgram> +#include <QtOpenGL/QGLShaderProgram> #include <QtCore/qtimer.h> #include <QtCore/qdatetime.h> diff --git a/tools/qt3d/qglinfo/qglinfo.pro b/tools/qt3d/qglinfo/qglinfo.pro index 7a01f22e2..9e301bf3d 100644 --- a/tools/qt3d/qglinfo/qglinfo.pro +++ b/tools/qt3d/qglinfo/qglinfo.pro @@ -1,5 +1,5 @@ TARGET = qglinfo -QT += 3d +QT += 3d widgets opengl SOURCES += main.cpp \ qglinfowindow.cpp \ |