diff options
Diffstat (limited to 'src/testlib/qtesthelpers_p.h')
| -rw-r--r-- | src/testlib/qtesthelpers_p.h | 54 |
1 files changed, 16 insertions, 38 deletions
diff --git a/src/testlib/qtesthelpers_p.h b/src/testlib/qtesthelpers_p.h index 0e39f7aea2..d05d7cc660 100644 --- a/src/testlib/qtesthelpers_p.h +++ b/src/testlib/qtesthelpers_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtTest module 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) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QTESTHELPERS_P_H #define QTESTHELPERS_P_H @@ -55,6 +19,7 @@ #include <QtCore/QString> #include <QtCore/QChar> #include <QtCore/QPoint> +#include <QtCore/private/qglobal_p.h> #ifdef QT_GUI_LIB #include <QtGui/QGuiApplication> @@ -103,6 +68,19 @@ static inline void setFrameless(QWidget *w) | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); w->setWindowFlags(flags); } + +static inline void androidCompatibleShow(QWidget *widget) +{ + // On Android QWidget::show() shows the widget maximized, so if we need + // to move or resize the widget, we need to explicitly call + // QWidget::setVisible(true) instead, because that's what show() actually + // does on desktop platforms. +#ifdef Q_OS_ANDROID + widget->setVisible(true); +#else + widget->show(); +#endif +} #endif // QT_WIDGETS_LIB } // namespace QTestPrivate |