diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:21:53 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:22:22 +0200 |
| commit | ce5ac7d67b59deb7c0e261e9ee21a475e6cb2e41 (patch) | |
| tree | ed4dcec9a0e9002156e085ffb6715436bc2e27c5 /src/imports/etcprovider/qetcprovider.h | |
| parent | f828bee19dee73246c09af3aad913b5540f1cbd0 (diff) | |
| parent | 63952084c085202e7eddca6840c518d8e07445d0 (diff) | |
Merge branch 'refactor'
Conflicts:
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2d_p_p.h
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
Diffstat (limited to 'src/imports/etcprovider/qetcprovider.h')
| -rw-r--r-- | src/imports/etcprovider/qetcprovider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h index a34b458b70..46ec421162 100644 --- a/src/imports/etcprovider/qetcprovider.h +++ b/src/imports/etcprovider/qetcprovider.h @@ -42,7 +42,7 @@ #ifndef QETCPROVIDER_H #define QETCPROVIDER_H -#include <qgl.h> +#include <qopengl.h> #include <QDeclarativeImageProvider> #include <QSGTexture> #include <QDeclarativeEngine> |