From b5bccedc120c52ed48b8a01c278a9b736e7d7ed0 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 17 Jun 2011 14:01:55 +0200 Subject: [PATCH] Make qml-compositor compile. --- examples/qml-compositor/main.cpp | 4 ++-- examples/qml-compositor/qml-compositor.pro | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index d92daea..9044bd3 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -62,8 +62,8 @@ public: setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml"))); setResizeMode(QSGView::SizeRootObjectToView); winId(); - if (platformWindow()) { - platformWindow()->glContext(); + if (windowHandle()) { + windowHandle()->glSurface(); } } diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro index 05dff71..4390133 100644 --- a/examples/qml-compositor/qml-compositor.pro +++ b/examples/qml-compositor/qml-compositor.pro @@ -17,6 +17,9 @@ LIBS += -L ../../lib QT += declarative QT += opengl +# to be removed once scenegraph gets rid of its widget dependencies +QT += widgets widgets-private + !isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) { QT += core-private gui-private declarative-private opengl-private } -- 2.7.4