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/declarative/util | |
| 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/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativepixmapcache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 108d2579ac..276219eb45 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -66,6 +66,7 @@ #include <QtCore/qdebug.h> #include <private/qobject_p.h> #include <QSslError> +#include <QOpenGLContext> #define IMAGEREQUEST_MAX_REQUEST_COUNT 8 #define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16 @@ -724,7 +725,7 @@ QDeclarativePixmapStore::QDeclarativePixmapStore() void QDeclarativePixmapStore::cleanTextureForContext(QDeclarativePixmapData *data) { if (data->context) { - Q_ASSERT(QGLContext::currentContext()); + Q_ASSERT(QOpenGLContext::currentContext()); delete data->texture; data->context = 0; data->texture = 0; |