diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
| commit | 8821284ac4e55caf5fe712fca002e79220e9cf7e (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/plugins/gfxdrivers/powervr/pvreglscreen | |
| parent | 2c5b7fe040575aa2ee560117c1c3455724c2f9ae (diff) | |
| parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
| download | Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.zip Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.gz Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/plugins/gfxdrivers/powervr/pvreglscreen')
| -rw-r--r-- | src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index 3a94851..b0ffbf1 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -381,7 +381,7 @@ void PvrEglSurfaceHolder::removeSurface() // create the temporary surface again. if (surface == EGL_NO_SURFACE && dpy != EGL_NO_DISPLAY) { surface = eglCreateWindowSurface - (dpy, config, (EGLNativeWindowType)tempSurface, NULL); + (dpy, config, (EGLNativeWindowType)(-1), NULL); if (surface == EGL_NO_SURFACE) qWarning("Could not re-create the temporary EGL surface"); } diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro index 691cd2d..675be85 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro @@ -9,9 +9,10 @@ DEFINES += QT_QWS_CLIENTBLIT INCLUDEPATH += ../QWSWSEGL + HEADERS = \ - pvreglscreen.h \ - pvreglwindowsurface.h + pvreglscreen.h \ + pvreglwindowsurface.h SOURCES = \ pvreglscreenplugin.cpp \ @@ -22,3 +23,5 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target + +include(../powervr.pri)
\ No newline at end of file |