diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 16:35:19 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 22:32:42 +0200 |
| commit | 7d3a56f3cf717a06823c33b031ea4f590e14002d (patch) | |
| tree | b5d2845e8353ba2de3028a9f32749ca622e115da /src/quick/scenegraph | |
| parent | f92c3aecd08eef468f9a47f2e970f22beecc8216 (diff) | |
| parent | e5f45d9b57bb0542ec47e5a8a4e57388b6d59d35 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 1 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgcontextplugin_p.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 8b632661c5..da1c8e6ee9 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -56,7 +56,6 @@ #include <QOpenGLContext> #include <QtGui/qopenglframebufferobject.h> -#include <QQmlImageProvider> #include <private/qqmlglobal_p.h> #include <QtQuick/private/qsgtexture_p.h> diff --git a/src/quick/scenegraph/qsgcontextplugin_p.h b/src/quick/scenegraph/qsgcontextplugin_p.h index cc7761a095..2c4531c239 100644 --- a/src/quick/scenegraph/qsgcontextplugin_p.h +++ b/src/quick/scenegraph/qsgcontextplugin_p.h @@ -43,11 +43,10 @@ #define QSGCONTEXTPLUGIN_H #include <QtQuick/qtquickglobal.h> +#include <QtQuick/qquickimageprovider.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <QQmlImageProvider> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |