diff options
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativeapplication.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativepixmapcache.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp index 11b0b636cb..f745ba6fa8 100644 --- a/src/declarative/util/qdeclarativeapplication.cpp +++ b/src/declarative/util/qdeclarativeapplication.cpp @@ -41,7 +41,7 @@ #include "qdeclarativeapplication_p.h" #include <private/qobject_p.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE 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; diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 98f437d9a3..4f198a537e 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -53,7 +53,7 @@ #include "private/qdeclarativestate_p_p.h" #include <QtCore/qdebug.h> -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <QtCore/qmath.h> #include <private/qobject_p.h> |