diff options
| author | Andy Nichols <andy.nichols@nokia.com> | 2011-10-26 12:48:01 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-26 13:31:25 +0200 |
| commit | 04653589ef14f07cba51d9c157778e20fa2dffd3 (patch) | |
| tree | 6c0e15a95e42aa514f9b0bfd40ea37320d75ad5d /examples | |
| parent | 170ff17b73e467e27cee87ba2eeec0576c67b89a (diff) | |
Rename QSG* to QQuick* in qtwayland module
Change-Id: I6029550cb9a892795d0db9aafea59801a1de3c68
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qml-compositor/main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp index fdf27b3bf..3ff3583f2 100644 --- a/examples/qml-compositor/main.cpp +++ b/examples/qml-compositor/main.cpp @@ -50,17 +50,17 @@ #include <QDeclarativeContext> #include <QtQuick1/QDeclarativeView> -#include <QSGItem> -#include <QSGView> +#include <QQuickItem> +#include <QQuickView> -class QmlCompositor : public QSGView, public WaylandCompositor +class QmlCompositor : public QQuickView, public WaylandCompositor { Q_OBJECT public: QmlCompositor() : WaylandCompositor(this, const_cast<QOpenGLContext *>(QOpenGLContext::currentContext())) { //setMouseTracking(true); setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml"))); - setResizeMode(QSGView::SizeRootObjectToView); + setResizeMode(QQuickView::SizeRootObjectToView); winId(); connect(this, SIGNAL(frameSwapped()), this, SLOT(frameSwappedSlot())); @@ -85,12 +85,12 @@ private slots: WaylandSurfaceItem *item = m_windowMap.value(surface); item->setWidth(size.width()); item->setHeight(size.height()); - emit windowResized(QVariant::fromValue(static_cast<QSGItem *>(item))); + emit windowResized(QVariant::fromValue(static_cast<QQuickItem *>(item))); } else { WaylandSurfaceItem *item = new WaylandSurfaceItem(surface, rootObject()); item->setTouchEventsEnabled(true); connect(surface, SIGNAL(destroyed(QObject *)), this, SLOT(surfaceDestroyed(QObject *))); - emit windowAdded(QVariant::fromValue(static_cast<QSGItem *>(item))); + emit windowAdded(QVariant::fromValue(static_cast<QQuickItem *>(item))); m_windowMap[surface] = item; item->takeFocus(); @@ -99,7 +99,7 @@ private slots: void surfaceDestroyed(QObject *object) { WaylandSurfaceItem *item = m_windowMap.take(object); - emit windowDestroyed(QVariant::fromValue(static_cast<QSGItem *>(item))); + emit windowDestroyed(QVariant::fromValue(static_cast<QQuickItem *>(item))); } void frameSwappedSlot() { |