diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-25 13:40:12 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:51 +0200 |
| commit | 957c8fb9946643a779e0a84eeeca2f150f221cba (patch) | |
| tree | f3cd7b62c4943f1c62c6da0ff802b296ac66c88d /src/qmltest | |
| parent | f37b38e4cd4aa9e0443640a1fd73c239cab0d45e (diff) | |
Get declarative running on new gui/opengl stack.
Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc.
Change-Id: I08379029d756e28b20ae141ca30ed801626b513d
Reviewed-on: http://codereview.qt.nokia.com/3711
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktest.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 3164d9ec06..7f16eddc7e 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -54,7 +54,7 @@ #endif #include <QtDeclarative/qjsvalue.h> #include <QtDeclarative/qjsengine.h> -#include <QtOpenGL/qgl.h> +#include <QtGui/qopengl.h> #include <QtCore/qurl.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h index 1f8fe210e7..a83d176cfa 100644 --- a/src/qmltest/quicktest.h +++ b/src/qmltest/quicktest.h @@ -45,7 +45,7 @@ #include <QtQuickTest/quicktestglobal.h> #include <QtWidgets/qwidget.h> #ifdef QT_OPENGL_LIB -#include <QtOpenGL/qgl.h> +#include <QtGui/qopengl.h> #endif QT_BEGIN_NAMESPACE @@ -65,7 +65,7 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, #define QUICK_TEST_OPENGL_MAIN(name) \ static QWidget *name##_create_viewport() \ { \ - return new QGLWidget(); \ + return new QOpenGLWidget(); \ } \ int main(int argc, char **argv) \ { \ @@ -83,7 +83,7 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, #define QUICK_TEST_OPENGL_MAIN(name) \ static QWidget *name##_create_viewport() \ { \ - return new QGLWidget(); \ + return new QOpenGLWidget(); \ } \ int main(int argc, char **argv) \ { \ |