diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-23 15:43:55 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-23 15:44:33 +0200 |
commit | 9f3d56e07671c286c0a3fe0cb1c00814bac2c0ce (patch) | |
tree | db27aa28e824d62034c4a0bfdb807f54c0e0822e /examples/qml-compositor | |
parent | c9f2063ba02cad1f1a05db5f2463da5bfc2630cf (diff) |
Get Qt compositor working with wayland EGL on refactor branch.
Diffstat (limited to 'examples/qml-compositor')
-rw-r--r-- | examples/qml-compositor/main.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index 588697506..f5a8b2c2d 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -57,14 +57,11 @@ class QmlCompositor : public QSGView, public WaylandCompositor { Q_OBJECT public: - QmlCompositor() : WaylandCompositor(this) { + QmlCompositor() : WaylandCompositor(this, const_cast<QGLContext *>(context())) { setMouseTracking(true); setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml"))); setResizeMode(QSGView::SizeRootObjectToView); winId(); - if (windowHandle()) { - windowHandle()->glSurface(); - } } signals: @@ -132,7 +129,6 @@ int main(int argc, char *argv[]) QObject::connect(&compositor, SIGNAL(windowResized(QVariant)), compositor.rootObject(), SLOT(windowResized(QVariant))); return app.exec(); - } #include "main.moc" |