From f0a1fa7f905652b2aafd3e28ed2ff237ca7b10ef Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 Oct 2021 20:25:22 +0200 Subject: example/tests: update com.theqtcompany to io.qt Pick-to: 6.2 Fixes: QTBUG-96370 Change-Id: Id0fc8ba2b552f7ab99fa208210c5bad016c3a043 Reviewed-by: Inho Lee --- examples/wayland/custom-extension/compositor/main.cpp | 2 +- examples/wayland/custom-extension/compositor/qml/main.qml | 2 +- examples/wayland/custom-extension/qml-client/main.cpp | 2 +- examples/wayland/custom-extension/qml-client/main.qml | 2 +- examples/wayland/server-buffer/compositor/main.cpp | 2 +- examples/wayland/server-buffer/compositor/qml/main.qml | 2 +- tests/manual/texture-sharing-2/custom-compositor/main.cpp | 2 +- tests/manual/texture-sharing-2/custom-compositor/qml/main.qml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/wayland/custom-extension/compositor/main.cpp b/examples/wayland/custom-extension/compositor/main.cpp index 91de8f798..b2dc1aa5d 100644 --- a/examples/wayland/custom-extension/compositor/main.cpp +++ b/examples/wayland/custom-extension/compositor/main.cpp @@ -60,7 +60,7 @@ static void registerTypes() { - qmlRegisterType("com.theqtcompany.customextension", 1, 0, "CustomExtension"); + qmlRegisterType("io.qt.examples.customextension", 1, 0, "CustomExtension"); } int main(int argc, char *argv[]) diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml index fcd7eba79..c826c0f05 100644 --- a/examples/wayland/custom-extension/compositor/qml/main.qml +++ b/examples/wayland/custom-extension/compositor/qml/main.qml @@ -52,7 +52,7 @@ import QtQuick import QtWayland.Compositor import QtWayland.Compositor.WlShell -import com.theqtcompany.customextension 1.0 +import io.qt.examples.customextension 1.0 WaylandCompositor { id: comp diff --git a/examples/wayland/custom-extension/qml-client/main.cpp b/examples/wayland/custom-extension/qml-client/main.cpp index 16b034993..8456d234f 100644 --- a/examples/wayland/custom-extension/qml-client/main.cpp +++ b/examples/wayland/custom-extension/qml-client/main.cpp @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - qmlRegisterType("com.theqtcompany.customextension", 1, 0, "CustomExtension"); + qmlRegisterType("io.qt.examples.customextension", 1, 0, "CustomExtension"); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); diff --git a/examples/wayland/custom-extension/qml-client/main.qml b/examples/wayland/custom-extension/qml-client/main.qml index dd9212ef2..37ab6d243 100644 --- a/examples/wayland/custom-extension/qml-client/main.qml +++ b/examples/wayland/custom-extension/qml-client/main.qml @@ -50,7 +50,7 @@ import QtQuick import QtQuick.Window -import com.theqtcompany.customextension +import io.qt.examples.customextension Window { id: topLevelWindow diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 689a3bbe7..cc19092ce 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -60,7 +60,7 @@ static void registerTypes() { - qmlRegisterType("com.theqtcompany.sharebufferextension", 1, 0, "ShareBufferExtension"); + qmlRegisterType("io.qt.examples.sharebufferextension", 1, 0, "ShareBufferExtension"); } int main(int argc, char *argv[]) diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/examples/wayland/server-buffer/compositor/qml/main.qml index 73b3fa8a4..fdf618deb 100644 --- a/examples/wayland/server-buffer/compositor/qml/main.qml +++ b/examples/wayland/server-buffer/compositor/qml/main.qml @@ -53,7 +53,7 @@ import QtWayland.Compositor import QtWayland.Compositor.WlShell import QtQuick.Window -import com.theqtcompany.sharebufferextension +import io.qt.examples.sharebufferextension WaylandCompositor { WaylandOutput { diff --git a/tests/manual/texture-sharing-2/custom-compositor/main.cpp b/tests/manual/texture-sharing-2/custom-compositor/main.cpp index af3750247..a9322833a 100644 --- a/tests/manual/texture-sharing-2/custom-compositor/main.cpp +++ b/tests/manual/texture-sharing-2/custom-compositor/main.cpp @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QQmlApplicationEngine appEngine; - qmlRegisterType("com.theqtcompany.customsharingextension", 1, 0, "CustomSharingExtension"); + qmlRegisterType("io.qt.tests.customsharingextension", 1, 0, "CustomSharingExtension"); appEngine.addImageProvider("wlshared", new QWaylandSharedTextureProvider); appEngine.load(QUrl("qrc:///qml/main.qml")); diff --git a/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml b/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml index 7a5705169..ce4307b02 100644 --- a/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml +++ b/tests/manual/texture-sharing-2/custom-compositor/qml/main.qml @@ -54,7 +54,7 @@ import QtWayland.Compositor import QtWayland.Compositor.XdgShell import QtWayland.Compositor.WlShell -import com.theqtcompany.customsharingextension +import io.qt.tests.customsharingextension WaylandCompositor { WaylandOutput { -- cgit v1.2.3