diff options
Diffstat (limited to 'tests/auto/quick/qtbug-70248')
-rw-r--r-- | tests/auto/quick/qtbug-70248/CMakeLists.txt | 20 | ||||
-rw-r--r-- | tests/auto/quick/qtbug-70248/qtbug-70248.pro | 5 | ||||
-rw-r--r-- | tests/auto/quick/qtbug-70248/test.qml | 6 | ||||
-rw-r--r-- | tests/auto/quick/qtbug-70248/test.qrc | 5 | ||||
-rw-r--r-- | tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp | 33 |
5 files changed, 27 insertions, 42 deletions
diff --git a/tests/auto/quick/qtbug-70248/CMakeLists.txt b/tests/auto/quick/qtbug-70248/CMakeLists.txt new file mode 100644 index 000000000..b177c5309 --- /dev/null +++ b/tests/auto/quick/qtbug-70248/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +qt_internal_add_test(tst_qtbug-70248 + SOURCES + tst_qtbug-70248.cpp + LIBRARIES + Qt::WebEngineQuickPrivate +) + +set(test_resource_files + "test.qml" +) + +qt_internal_add_resource(tst_qtbug-70248 "test" + PREFIX + "/" + FILES + ${test_resource_files} +) diff --git a/tests/auto/quick/qtbug-70248/qtbug-70248.pro b/tests/auto/quick/qtbug-70248/qtbug-70248.pro deleted file mode 100644 index e1b18bc16..000000000 --- a/tests/auto/quick/qtbug-70248/qtbug-70248.pro +++ /dev/null @@ -1,5 +0,0 @@ -include(../tests.pri) -QT += webengine webengine-private - -RESOURCES += \ - test.qrc diff --git a/tests/auto/quick/qtbug-70248/test.qml b/tests/auto/quick/qtbug-70248/test.qml index 35962aff5..5870f593e 100644 --- a/tests/auto/quick/qtbug-70248/test.qml +++ b/tests/auto/quick/qtbug-70248/test.qml @@ -1,6 +1,6 @@ -import QtQuick 2.9 -import QtQuick.Window 2.2 -import QtWebEngine 1.3 +import QtQuick +import QtQuick.Window +import QtWebEngine Window { visible: true diff --git a/tests/auto/quick/qtbug-70248/test.qrc b/tests/auto/quick/qtbug-70248/test.qrc deleted file mode 100644 index 83fea5eb0..000000000 --- a/tests/auto/quick/qtbug-70248/test.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>test.qml</file> - </qresource> -</RCC> diff --git a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp index 3dffa1d84..1cf62e800 100644 --- a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp +++ b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp @@ -1,32 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#include "qtwebengineglobal.h" +#include "qtwebenginequickglobal.h" #include <QQuickWebEngineProfile> #include <QQmlApplicationEngine> #include <QQuickWindow> @@ -43,7 +18,7 @@ private slots: void tst_qtbug_70248::test() { - QtWebEngine::initialize(); + QtWebEngineQuick::initialize(); QScopedPointer<QQmlApplicationEngine> engine; QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true); engine.reset(new QQmlApplicationEngine()); |