diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2023-12-11 12:10:18 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2023-12-11 12:19:13 +0100 |
| commit | dda7d333253f598cd5becf6e745393e75c5b1127 (patch) | |
| tree | 88ae65eacb700af3ebafaf7ab21f334290dab3e2 | |
| parent | e4b0cbb3d649d0167f336e0547c6e39df97f37d9 (diff) | |
Don't use versioned imports
In Qt 6, the canonical import is without a version number.
Pick-to: 6.6 6.7
Change-Id: I64e194392f1fa1912c16650f40c40a6c6257de77
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml index 5a98a83..7823df8 100644 --- a/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml +++ b/examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml @@ -1,7 +1,7 @@ // Copyright (C) 2016 Kurt Pattyn <pattyn.kurt@gmail.com>. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 -import QtWebSockets 1.0 +import QtQuick +import QtWebSockets Rectangle { width: 640 diff --git a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml index 644e4d6..0875a0a 100644 --- a/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml +++ b/examples/websockets/qmlwebsocketserver/qml/qmlwebsocketserver/main.qml @@ -1,8 +1,8 @@ // Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.0 -import QtWebSockets 1.0 +import QtQuick +import QtWebSockets Rectangle { width: 360 diff --git a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml index 78ecd86..1cbc1e0 100644 --- a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml +++ b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml @@ -1,9 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -import QtQuick 2.5 -import QtWebSockets 1.1 -import QtTest 1.1 +import QtQuick +import QtWebSockets +import QtTest Rectangle { width: 360 |