summaryrefslogtreecommitdiff
path: root/src/mtexturepixmapitem_p.h
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-10-04 16:50:08 +0300
committerKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-10-04 16:50:08 +0300
commit485277ebf58de88f908f2a4103f3c5c2b79bd3de (patch)
treed18a95b6c8fb41faac12a00a0d0bc846c2a0f623 /src/mtexturepixmapitem_p.h
parent7ff699a944f10f60dc779fdb32028245bfc0f034 (diff)
Find out QGLWidget in MTexturePixmapPrivate::installPixelShader if it's not done
- installPixelShader depends on static variables glresource and glwidget, so make glwidget static too
Diffstat (limited to 'src/mtexturepixmapitem_p.h')
-rw-r--r--src/mtexturepixmapitem_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mtexturepixmapitem_p.h b/src/mtexturepixmapitem_p.h
index 75bf3b2..a3c9dfe 100644
--- a/src/mtexturepixmapitem_p.h
+++ b/src/mtexturepixmapitem_p.h
@@ -51,7 +51,7 @@ class MTexturePixmapPrivate: QObject
{
Q_OBJECT
public:
- MTexturePixmapPrivate(Window window, QGLWidget *w, MTexturePixmapItem *item);
+ MTexturePixmapPrivate(Window window, MTexturePixmapItem *item);
~MTexturePixmapPrivate();
void init();
void updateWindowPixmap(XRectangle *rects = 0, int num = 0);
@@ -66,8 +66,8 @@ public:
void installEffect(MCompositeWindowShaderEffect* effect);
static GLuint installPixelShader(const QByteArray& code);
- QGLContext *ctx;
- QGLWidget *glwidget;
+ static QGLContext *ctx;
+ static QGLWidget *glwidget;
Window window;
Pixmap windowp;
#ifdef GLES2_VERSION