AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shut up setParent warning.

Browse Source 
Change-Id: I43af8bf83d3071f7c1d2eff082df5b1414f553b8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
BogDan Vatra 2014-01-29 17:06:26 +02:00 committed by The Qt Project
parent 6fe4deca3f
commit 398f029f62
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/android/qandroidplatformwindow.cpp
View File

@ -126,6 +126,11 @@ Qt::WindowFlags QAndroidPlatformWindow::windowFlags() const
return m_windowFlags; return m_windowFlags;
} }
void QAndroidPlatformWindow::setParent(const QPlatformWindow *window)
{
Q_UNUSED(window);
}
QAndroidPlatformScreen *QAndroidPlatformWindow::platformScreen() const QAndroidPlatformScreen *QAndroidPlatformWindow::platformScreen() const
{ {
return static_cast<QAndroidPlatformScreen *>(window()->screen()->handle()); return static_cast<QAndroidPlatformScreen *>(window()->screen()->handle());

2
src/plugins/platforms/android/qandroidplatformwindow.h
View File

@ -63,7 +63,7 @@ public:
void setWindowState(Qt::WindowState state); void setWindowState(Qt::WindowState state);
void setWindowFlags(Qt::WindowFlags flags); void setWindowFlags(Qt::WindowFlags flags);
Qt::WindowFlags windowFlags() const; Qt::WindowFlags windowFlags() const;
void setParent(const QPlatformWindow *window);
WId winId() const { return m_windowId; } WId winId() const { return m_windowId; }
QAndroidPlatformScreen *platformScreen() const; QAndroidPlatformScreen *platformScreen() const;