diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2012-07-26 09:59:31 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2012-07-26 10:19:57 -0300 |
| commit | 08c4c5021cb3f1f3023191d4a7ee09d133192f32 (patch) | |
| tree | fafbaacf23d79ee7ac9ab8751f5332cdce02eba4 | |
| parent | d181ceb8f979d5d5a3c28b4be687c36993161f72 (diff) | |
Some renames to keep up with recent API changes on Qt5.
QQuickCanvas became QQuickWindow, and its method setClearColor
became setColor.
See http://lists.qt-project.org/pipermail/development/2012-July/005009.html
and qtdeclarative/feb996e3.
Reviewed-by: Rafael Brandão
| -rw-r--r-- | src/core/PopupWindow.cpp | 8 | ||||
| -rw-r--r-- | src/core/PopupWindow.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/PopupWindow.cpp b/src/core/PopupWindow.cpp index 6c2c61d..1146033 100644 --- a/src/core/PopupWindow.cpp +++ b/src/core/PopupWindow.cpp @@ -19,7 +19,7 @@ #include <QtCore/QTimer> PopupWindow::PopupWindow(QWindow* parent) - : QQuickCanvas(parent) + : QQuickWindow(parent) { setWindowFlags(Qt::Popup); QSurfaceFormat surfaceFormat; @@ -31,7 +31,7 @@ PopupWindow::PopupWindow(QWindow* parent) void PopupWindow::showEvent(QShowEvent* ev) { - QQuickCanvas::showEvent(ev); + QQuickWindow::showEvent(ev); // In XCB, we are only guaranteed to grab the mouse if there's a platformWindow // created. This happens right after this event is sent. QTimer::singleShot(0, this, SLOT(setMouseGrab())); @@ -39,13 +39,13 @@ void PopupWindow::showEvent(QShowEvent* ev) void PopupWindow::hideEvent(QHideEvent* ev) { - QQuickCanvas::hideEvent(ev); + QQuickWindow::hideEvent(ev); setMouseGrabEnabled(false); } void PopupWindow::mousePressEvent(QMouseEvent* ev) { - QQuickCanvas::mousePressEvent(ev); + QQuickWindow::mousePressEvent(ev); const bool outsideWindow = ev->x() < 0 || ev->x() > width() || ev->y() < 0 || ev->y() > height(); if (outsideWindow) hide(); diff --git a/src/core/PopupWindow.h b/src/core/PopupWindow.h index 189adb3..8b44ccf 100644 --- a/src/core/PopupWindow.h +++ b/src/core/PopupWindow.h @@ -17,9 +17,9 @@ #ifndef PopupWindow_h #define PopupWindow_h -#include <QtQuick/QQuickCanvas> +#include <QtQuick/QQuickWindow> -class PopupWindow : public QQuickCanvas { +class PopupWindow : public QQuickWindow { Q_OBJECT public: |