diff options
| author | BogDan Vatra <bogdan@kde.org> | 2014-01-29 17:06:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 12:07:59 +0100 |
| commit | 398f029f62277b0c6689fe8b3c12aaa974c34ea1 (patch) | |
| tree | 39c8183e5b7e61c53e563d0d7b01b4596073a4fd | |
| parent | 6fe4deca3fe2e70ef7f956d75a20954e8f214b35 (diff) | |
Shut up setParent warning.
Change-Id: I43af8bf83d3071f7c1d2eff082df5b1414f553b8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformwindow.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformwindow.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp index 7c2dfd6bac..b4231f0283 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp @@ -126,6 +126,11 @@ Qt::WindowFlags QAndroidPlatformWindow::windowFlags() const return m_windowFlags; } +void QAndroidPlatformWindow::setParent(const QPlatformWindow *window) +{ + Q_UNUSED(window); +} + QAndroidPlatformScreen *QAndroidPlatformWindow::platformScreen() const { return static_cast<QAndroidPlatformScreen *>(window()->screen()->handle()); diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index db3cb35368..764dd3ab86 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -63,7 +63,7 @@ public: void setWindowState(Qt::WindowState state); void setWindowFlags(Qt::WindowFlags flags); Qt::WindowFlags windowFlags() const; - + void setParent(const QPlatformWindow *window); WId winId() const { return m_windowId; } QAndroidPlatformScreen *platformScreen() const; |