summaryrefslogtreecommitdiffstats
path: root/examples/qml-compositor
diff options
context:
space:
mode:
authorMatthew Cattell <matthew.cattell@nokia.com>2011-08-18 14:49:01 +0200
committerMatthew Cattell <matthew.cattell@nokia.com>2011-08-18 14:49:01 +0200
commit82ddd8c5d5c12200d4bfafc09354608d15ab015a (patch)
treec668ea6ab2036b49b5cc28064862dbed8d53d9b6 /examples/qml-compositor
parent1c774f6d0deb995c826e85914ef641ae4acae97a (diff)
make compositor build with refactor - frameSwapped slot added
Diffstat (limited to 'examples/qml-compositor')
-rw-r--r--examples/qml-compositor/main.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index 7564b4433..d1c4513cb 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -57,11 +57,13 @@ class QmlCompositor : public QSGView, public WaylandCompositor
{
Q_OBJECT
public:
- QmlCompositor() : WaylandCompositor(this, const_cast<QGLContext *>(context())) {
- setMouseTracking(true);
+ QmlCompositor() : WaylandCompositor(this, const_cast<QGLContext *>(QGLContext::currentContext())) {
+ //setMouseTracking(true);
setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
setResizeMode(QSGView::SizeRootObjectToView);
winId();
+
+ connect(this, SIGNAL(frameSwapped()), this, SLOT(frameSwappedSlot()));
}
signals:
@@ -100,17 +102,21 @@ private slots:
emit windowDestroyed(QVariant::fromValue(static_cast<QSGItem *>(item)));
}
+ void frameSwappedSlot() {
+ frameFinished();
+ }
+
protected:
void surfaceCreated(WaylandSurface *surface) {
connect(surface, SIGNAL(mapped(const QSize &)), this, SLOT(surfaceMapped(const QSize &)));
}
-
+#if 0
void paintEvent(QPaintEvent *event) {
QSGView::paintEvent(event);
frameFinished();
glFinish();
}
-
+#endif
private:
QMap<QObject *, WaylandSurfaceItem *> m_windowMap;
};