summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-08-29 14:18:03 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-08-29 14:18:03 +0200
commit19db756c2a27afc1ea1a6ac345902eb936677688 (patch)
tree7275755ad6b47de7226ff9d9335a5c467ee9779c /examples
parent2f835d7b552319b556ce4bc6a85989ba4a90e956 (diff)
Fixed build and crash issues.
Diffstat (limited to 'examples')
-rw-r--r--examples/qml-compositor/main.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index d1c4513..134760d 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -102,21 +102,15 @@ private slots:
emit windowDestroyed(QVariant::fromValue(static_cast<QSGItem *>(item)));
}
- void frameSwappedSlot() {
- frameFinished();
- }
+ 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;
};