diff options
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxwindow.cpp | 63 |
1 files changed, 4 insertions, 59 deletions
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index 146db2909c..eed45227f6 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -1,41 +1,7 @@ -/*************************************************************************** -** -** Copyright (C) 2011 - 2013 BlackBerry Limited. All rights reserved. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2011 - 2013 BlackBerry Limited. All rights reserved. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses #include "qqnxglobal.h" @@ -157,7 +123,6 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, bool needRootW m_exposed(true), m_foreign(false), m_windowState(Qt::WindowNoState), - m_mmRendererWindow(0), m_firstActivateHandled(false) { qWindowDebug() << "window =" << window << ", size =" << window->size(); @@ -280,7 +245,6 @@ QQnxWindow::QQnxWindow(QWindow *window, screen_context_t context, screen_window_ , m_exposed(true) , m_foreign(true) , m_windowState(Qt::WindowNoState) - , m_mmRendererWindow(0) , m_parentGroupName(256, 0) , m_isTopLevel(false) { @@ -752,22 +716,6 @@ void QQnxWindow::propagateSizeHints() qWindowDebug("ignored"); } -void QQnxWindow::setMMRendererWindowName(const QString &name) -{ - m_mmRendererWindowName = name; -} - -void QQnxWindow::setMMRendererWindow(screen_window_t handle) -{ - m_mmRendererWindow = handle; -} - -void QQnxWindow::clearMMRendererWindow() -{ - m_mmRendererWindowName.clear(); - m_mmRendererWindow = 0; -} - QPlatformScreen *QQnxWindow::screen() const { return m_screen; @@ -912,9 +860,6 @@ void QQnxWindow::updateZorder(int &topZorder) { updateZorder(m_window, topZorder); - if (m_mmRendererWindow) - updateZorder(m_mmRendererWindow, topZorder); - Q_FOREACH (QQnxWindow *childWindow, m_childWindows) childWindow->updateZorder(topZorder); } |