projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee60794
)
Compile fix for readbackglx after surface->backingstore renaming.
author
Laszlo Agocs
<laszlo.p.agocs@nokia.com>
Tue, 21 Jun 2011 08:09:56 +0000
(10:09 +0200)
committer
Laszlo Agocs
<laszlo.p.agocs@nokia.com>
Tue, 21 Jun 2011 08:10:22 +0000
(10:10 +0200)
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
patch
|
blob
|
history
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
patch
|
blob
|
history
diff --git
a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
index
61fd26f
..
0ca0418
100644
(file)
--- a/
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
+++ b/
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
@@
-41,7
+41,7
@@
#include "qwaylandreadbackglxcontext.h"
-#include "qwaylandshm
surfac
e.h"
+#include "qwaylandshm
backingstor
e.h"
#include "qwaylandreadbackglxwindow.h"
#include <QtGui/QGuiGLContext>
diff --git
a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
index
5565e78
..
df55caa
100644
(file)
--- a/
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
+++ b/
src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp
@@
-42,8
+42,7
@@
#include <QtDebug>
#include "qwaylandreadbackglxwindow.h"
-
-#include "qwaylandshmsurface.h"
+#include "qwaylandshmbackingstore.h"
QWaylandReadbackGlxWindow::QWaylandReadbackGlxWindow(QWindow *window, QWaylandReadbackGlxIntegration *glxIntegration)
: QWaylandShmWindow(window)