diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-19 14:03:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-23 16:22:41 +0000 |
| commit | a6a42cf01681bda5ad7f97d65f6108534ab7745e (patch) | |
| tree | 5fc125cbb711b089fbe69995c4773baeeebe7d2f /tests/auto/widgets/defaultsurfaceformat | |
| parent | 68ff88a1d767a64dd8d9b90615567789feebcefe (diff) | |
Clean-up of test names
We want to only use the qwebengine-prefix for tests of actual classes.
Change-Id: I0ab4e17f3b4994cc67e836112965307236d61549
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/widgets/defaultsurfaceformat')
4 files changed, 84 insertions, 0 deletions
diff --git a/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro b/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro new file mode 100644 index 000000000..e99c7f493 --- /dev/null +++ b/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro @@ -0,0 +1 @@ +include(../tests.pri) diff --git a/tests/auto/widgets/defaultsurfaceformat/resources/index.html b/tests/auto/widgets/defaultsurfaceformat/resources/index.html new file mode 100644 index 000000000..53726e4a6 --- /dev/null +++ b/tests/auto/widgets/defaultsurfaceformat/resources/index.html @@ -0,0 +1,6 @@ +<html> +<head> +<title> Basic Page </title> +</head> +<h1>Basic page</h1> +</html> diff --git a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp new file mode 100644 index 000000000..697ed3d08 --- /dev/null +++ b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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 General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> +#include "../util.h" + +#include <QSurfaceFormat> +#include <QTimer> +#include <qwebengineview.h> + +class tst_QWebEngineDefaultSurfaceFormat : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void customDefaultSurfaceFormat(); +}; + +void tst_QWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat() +{ +#if !defined(Q_OS_MACOS) + QSKIP("OpenGL Core Profile is currently only supported on macOS."); +#endif + // Setting a new default QSurfaceFormat with a core OpenGL profile before + // app instantiation should succeed, without abort() being called. + int argc = 1; + char *argv[] = { const_cast<char*>("tst_QWebEngineDefaultSurfaceFormat") }; + + QSurfaceFormat format; + format.setVersion( 3, 3 ); + format.setProfile( QSurfaceFormat::CoreProfile ); + QSurfaceFormat::setDefaultFormat( format ); + + QApplication app(argc, argv); + + QWebEngineView view; + view.load(QUrl("qrc:///resources/index.html")); + view.show(); + QObject::connect(&view, &QWebEngineView::loadFinished, []() { + QTimer::singleShot(100, qApp, &QCoreApplication::quit); + }); + + QCOMPARE(app.exec(), 0); +} + +QTEST_APPLESS_MAIN(tst_QWebEngineDefaultSurfaceFormat) +#include "tst_defaultsurfaceformat.moc" diff --git a/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc new file mode 100644 index 000000000..3d5f1b3b2 --- /dev/null +++ b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>resources/index.html</file> +</qresource> +</RCC> |