qface-tutorial: Improve qml plugin code

Also add the CLASS_NAME for static linking
and IMPORTS statement for a QML dependency to qt_add_qml_module.

Change-Id: Ia12600994b3046104bb1a7128f3ef7e34039543d
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 15f8311e5ed14eb5a435972941367af47d0d0112)

7 files changed, 12 insertions, 118 deletions

diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/demo_server/instrumentcluster.cpp b/examples/interfaceframework/qface-tutorial/ch6-own-backend/demo_server/instrumentcluster.cpp
deleted file mode 100644
index 0f0c513c..00000000
--- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/demo_server/instrumentcluster.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (C) 2021 The Qt Company Ltd.
-// Copyright (C) 2019 Luxoft Sweden AB
-// Copyright (C) 2018 Pelagicore AG
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-#include "instrumentcluster.h"
-#include <QThread>
-
-InstrumentCluster::InstrumentCluster(QObject *parent)
-    : QObject(parent)
-    , m_speed(0)
-    , m_rpm(0)
-    , m_fuel(0)
-    , m_temperature(15)
-    , m_systemType(InstrumentClusterModule::Metric)
-{
-    startTimer(100);
-}
-
-int InstrumentCluster::speed() const
-{
-    return m_speed;
-}
-
-int InstrumentCluster::rpm() const
-{
-    return m_rpm;
-}
-
-qreal InstrumentCluster::fuel() const
-{
-    return m_fuel;
-}
-
-qreal InstrumentCluster::temperature() const
-{
-    return m_temperature;
-}
-
-InstrumentClusterModule::SystemType InstrumentCluster::systemType() const
-{
-    return m_systemType;
-}
-
-Warning InstrumentCluster::currentWarning() const
-{
-    return m_currentWarning;
-}
-
-void InstrumentCluster::setSpeed(int speed)
-{
-    if (m_speed == speed)
-        return;
-
-    m_speed = speed;
-    emit speedChanged(m_speed);
-}
-
-void InstrumentCluster::setRpm(int rpm)
-{
-    if (m_rpm == rpm)
-        return;
-
-    m_rpm = rpm;
-    emit rpmChanged(m_rpm);
-}
-
-void InstrumentCluster::setFuel(qreal fuel)
-{
-    if (qFuzzyCompare(m_fuel, fuel))
-        return;
-
-    m_fuel = fuel;
-    emit fuelChanged(m_fuel);
-}
-
-void InstrumentCluster::setTemperature(qreal temperature)
-{
-    if (qFuzzyCompare(m_temperature, temperature))
-        return;
-
-    m_temperature = temperature;
-    emit temperatureChanged(m_temperature);
-}
-
-void InstrumentCluster::setSystemType(InstrumentClusterModule::SystemType systemType)
-{
-    if (m_systemType == systemType)
-        return;
-
-    m_systemType = systemType;
-    emit systemTypeChanged(m_systemType);
-}
-
-void InstrumentCluster::setCurrentWarning(const Warning &currentWarning)
-{
-    if (m_currentWarning == currentWarning)
-        return;
-
-    m_currentWarning = currentWarning;
-    emit currentWarningChanged(m_currentWarning);
-}
-
-void InstrumentCluster::timerEvent(QTimerEvent *event)
-{
-    Q_UNUSED(event);
-
-    if (speed() >= 250)
-        setSpeed(0);
-    else
-        setSpeed(speed() + 1);
-
-    if (rpm() >= 5000)
-        setRpm(0);
-    else
-        setRpm(rpm() + 100);
-}
diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt
index 9f1d217c..9e4f397b 100644
--- a/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt
@@ -18,9 +18,12 @@ qt_add_qml_module(ic_chapter7_imports
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}"
     URI ${CLUSTER_URI}
     VERSION ${CLUSTER_VERSION}
+    CLASS_NAME InstrumentClusterModuleQmlPlugin
+    RESOURCE_PREFIX "/"
     PLUGIN_TARGET ic_chapter7_imports
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
+    IMPORTS QtInterfaceFramework
     SOURCES
         ${CLUSTER_SOURCES}
 )
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
index a0542253..1fe9a9aa 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
@@ -18,10 +18,12 @@ qt_add_qml_module(ic_chapter3_imports
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}"
     URI ${CLUSTER_URI}
     VERSION ${CLUSTER_VERSION}
+    CLASS_NAME InstrumentClusterModuleQmlPlugin
     RESOURCE_PREFIX "/"
     PLUGIN_TARGET ic_chapter3_imports
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
+    IMPORTS QtInterfaceFramework
     SOURCES
         ${CLUSTER_SOURCES}
 )
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
index 7eebbe94..5e716f17 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
@@ -18,10 +18,12 @@ qt_add_qml_module(ic_chapter4_imports
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}"
     URI ${CLUSTER_URI}
     VERSION ${CLUSTER_VERSION}
+    CLASS_NAME InstrumentClusterModuleQmlPlugin
     RESOURCE_PREFIX "/"
     PLUGIN_TARGET ic_chapter4_imports
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
+    IMPORTS QtInterfaceFramework
     SOURCES
         ${CLUSTER_SOURCES}
 )
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
index 6bbf80a2..f50c4bc4 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
@@ -18,10 +18,12 @@ qt_add_qml_module(ic_chapter5_imports
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}"
     URI ${CLUSTER_URI}
     VERSION ${CLUSTER_VERSION}
+    CLASS_NAME InstrumentClusterModuleQmlPlugin
     RESOURCE_PREFIX "/"
     PLUGIN_TARGET ic_chapter5_imports
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
+    IMPORTS QtInterfaceFramework
     SOURCES
         ${CLUSTER_SOURCES}
 )
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
index 817cfe23..29f93519 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
@@ -18,10 +18,12 @@ qt_add_qml_module(ic_chapter6_imports
     OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}"
     URI ${CLUSTER_URI}
     VERSION ${CLUSTER_VERSION}
+    CLASS_NAME InstrumentClusterModuleQmlPlugin
     RESOURCE_PREFIX "/"
     PLUGIN_TARGET ic_chapter6_imports
     NO_PLUGIN_OPTIONAL
     NO_GENERATE_PLUGIN_SOURCE
+    IMPORTS QtInterfaceFramework
     SOURCES
         ${CLUSTER_SOURCES}
 )
diff --git a/src/interfaceframework/doc/src/ifcodegen/buildsystem-integration.qdoc b/src/interfaceframework/doc/src/ifcodegen/buildsystem-integration.qdoc
index b2f0a7d9..078b0198 100644
--- a/src/interfaceframework/doc/src/ifcodegen/buildsystem-integration.qdoc
+++ b/src/interfaceframework/doc/src/ifcodegen/buildsystem-integration.qdoc
@@ -183,7 +183,7 @@ qt_add_qml_module(IfVehicleFunctions
     RESOURCE_PREFIX "/"
     CLASS_NAME QtIfVehicleFunctionsPlugin
     PLUGIN_TARGET qtifvehiclefunctionsplugin
-    IMPORTS QtInterfaceFramework/auto
+    IMPORTS QtInterfaceFramework
 )
 \endcode