diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-11-30 10:59:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-03 14:29:27 +0100 |
| commit | 168f32f3f42a2407858105aff10143eebabbd5a6 (patch) | |
| tree | 918229bf2b4d123805860a9137c0855531746964 /src/plugins/platforms/qnx | |
| parent | ad4de55eb4186656bbe1b8c26f3f0d696b8f56b9 (diff) | |
Removed temporary backwards-compat properties and accessors in QWindow
Change-Id: I718b877e3b6c0b1191a932d934599d5c2f5aa958
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/plugins/platforms/qnx')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxscreen.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxwindow.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index 593bec8458..8b413de4fb 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -425,7 +425,7 @@ void QQnxScreen::addWindow(QQnxWindow *window) // Such a situation would strangely break focus handling due to the // invisible desktop widget window being layered on top of normal // windows - if (window->window()->windowType() == Qt::Desktop) + if (window->window()->type() == Qt::Desktop) m_childWindows.push_front(window); else m_childWindows.push_back(window); diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index e4505c6c60..787f371ca6 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -511,8 +511,8 @@ void QQnxWindow::setScreen(QQnxScreen *platformScreen) Q_FOREACH (QQnxWindow *childWindow, m_childWindows) { // Only subwindows and tooltips need necessarily be moved to another display with the window. - if ((window()->windowType() & Qt::WindowType_Mask) == Qt::SubWindow || - (window()->windowType() & Qt::WindowType_Mask) == Qt::ToolTip) + if ((window()->type() & Qt::WindowType_Mask) == Qt::SubWindow || + (window()->type() & Qt::WindowType_Mask) == Qt::ToolTip) childWindow->setScreen(platformScreen); } |