diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 15:48:36 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 15:48:36 +0200 |
| commit | c7537e30ba4698b52d90b68875af16285785bf70 (patch) | |
| tree | ca0f839784bf0447a0d619b21582b4d2642e4053 /src/plugins/platforms/eglfs | |
| parent | b56444d86aa449e2da15d9b9fd08001f09ac9b25 (diff) | |
Remove hasOpenGL. This changes breaks binary compatibillity
so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications
Diffstat (limited to 'src/plugins/platforms/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsscreen.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfswindow.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index 78981f9be7..1bc0806e7e 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -44,12 +44,12 @@ #include "qeglfswindow.h" #include "qeglfswindowsurface.h" +#include "qgenericunixfontdatabase.h" + #include <QtGui/QPlatformWindow> #include <QtGui/QPlatformWindowFormat> #include <QtOpenGL/private/qpixmapdata_gl_p.h> -#include "qgenericunixfontdatabase.h" - #include <EGL/egl.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h index 6a2a504ed6..f300842307 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.h +++ b/src/plugins/platforms/eglfs/qeglfsscreen.h @@ -44,6 +44,7 @@ #include <QPlatformScreen> +#include <QtCore/QTextStream> #include <EGL/egl.h> diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index ad51114066..f125eab3c1 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -45,12 +45,9 @@ #include "qeglfsintegration.h" #include "qeglfsscreen.h" - #include <QPlatformWindow> #include <QtGui/QWidget> -#include <EGL/egl.h> - QT_BEGIN_NAMESPACE class QEglFSWindow : public QPlatformWindow |