Port to Qt 6.2

 - Build is warning free on Linux
 - Still using qmake
 - Custom fragmenShaders in the cluster are not ported yet
 - Qt 3D models are rendered, but the Studio 3D integration is untested

Change-Id: I0e410a932d6461ba29e7c945cb5e9750d6df8964
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Bramastyo Harimukti Santoso <bram.harimukti@gmail.com>

13 files changed, 57 insertions, 58 deletions

diff --git a/src/remotesettings/app/DevelopmentPage.qml b/src/remotesettings/app/DevelopmentPage.qml
index d84f16fa..191b3dca 100644
--- a/src/remotesettings/app/DevelopmentPage.qml
+++ b/src/remotesettings/app/DevelopmentPage.qml
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2019-2020 Luxoft Sweden AB
 ** Contact: https://www.qt.io/licensing/
@@ -401,7 +401,7 @@ Flickable {
             }
 
             Label {
-                text: qsTr("Qt IVI Version: ") + qtiviVersion
+                text: qsTr("Qt IF Version: ") + qtifVersion
                 Layout.alignment: Qt.AlignHCenter
             }
         }
diff --git a/src/remotesettings/app/MediaPage.qml b/src/remotesettings/app/MediaPage.qml
index 523aa7ac..c36f55f3 100644
--- a/src/remotesettings/app/MediaPage.qml
+++ b/src/remotesettings/app/MediaPage.qml
@@ -32,7 +32,7 @@ import QtQuick 2.8
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import QtIvi.Media 1.0
+import QtInterfaceFramework.Media
 
 Flickable {
     id: root
diff --git a/src/remotesettings/app/Vehicle2DPanel.qml b/src/remotesettings/app/Vehicle2DPanel.qml
index 870cd998..aa19c93e 100644
--- a/src/remotesettings/app/Vehicle2DPanel.qml
+++ b/src/remotesettings/app/Vehicle2DPanel.qml
@@ -30,7 +30,7 @@
 ****************************************************************************/
 
 import QtQuick 2.9
-import QtGraphicalEffects 1.12
+import Qt5Compat.GraphicalEffects
 
 
 Item {
diff --git a/src/remotesettings/app/app.pro b/src/remotesettings/app/app.pro
index e5fd7b68..cc175ccc 100644
--- a/src/remotesettings/app/app.pro
+++ b/src/remotesettings/app/app.pro
@@ -1,7 +1,7 @@
 VERSION  = 5.15.1
 TARGET = neptune-companion-app
 DESTDIR = $$BUILD_DIR
-QT += quick ivicore ivimedia
+QT += quick interfaceframework ifmedia
 CONFIG += c++11
 macos: CONFIG -= app_bundle
 
diff --git a/src/remotesettings/app/client.cpp b/src/remotesettings/app/client.cpp
index 48b500a2..06cb56c9 100644
--- a/src/remotesettings/app/client.cpp
+++ b/src/remotesettings/app/client.cpp
@@ -61,9 +61,9 @@ Client::Client(QObject *parent) : QObject(parent),
     connect(&m_connectionMonitoringTimer, &QTimer::timeout, this, &Client::onCMTimeout);
     connect(&m_connectionMonitoring, &ConnectionMonitoring::counterChanged,
             this, &Client::onCMCounterChanged);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::isInitializedChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::isInitializedChanged,
             this, &Client::updateConnectionStatus);
-    connect(&m_connectionMonitoring, &QIviAbstractFeature::errorChanged,
+    connect(&m_connectionMonitoring, &QIfAbstractFeature::errorChanged,
             this, &Client::updateConnectionStatus);
     connect(&m_reconnectionTimer, &QTimer::timeout, this, &Client::onReconnectionTimeout);
     readSettings();
@@ -130,7 +130,7 @@ void Client::connectToServer(const QString &serverUrl)
     settings.setValue(QStringLiteral("Registry"), driveDataUrl.toString());
     settings.endGroup();
     settings.sync();
-    settings.beginGroup(QStringLiteral("qtivimedia"));
+    settings.beginGroup(QStringLiteral("qtifmedia"));
     settings.setValue(QStringLiteral("Registry"), iviMediaUrl.toString());
     settings.endGroup();
     settings.sync();
@@ -151,7 +151,7 @@ void Client::connectToServer(const QString &serverUrl)
 void Client::updateConnectionStatus()
 {
     bool c = m_connectionMonitoring.isInitialized() &&
-             m_connectionMonitoring.error()==QIviAbstractFeature::NoError &&
+             m_connectionMonitoring.error()==QIfAbstractFeature::NoError &&
              !m_timedOut;
     if (c == m_connected)
         return;
diff --git a/src/remotesettings/app/main.cpp b/src/remotesettings/app/main.cpp
index fdc99c88..a08815ad 100644
--- a/src/remotesettings/app/main.cpp
+++ b/src/remotesettings/app/main.cpp
@@ -34,7 +34,7 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QtCore/QCommandLineParser>
-#include <QtIviCore/QtIviCoreVersion>
+#include <QtInterfaceFramework/QtInterfaceFrameworkVersion>
 #include "client.h"
 
 // code to transform a macro into a string literal
@@ -43,7 +43,6 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QCoreApplication::setApplicationName(QStringLiteral("Neptune Companion"));
     QCoreApplication::setOrganizationName(QStringLiteral("Luxoft Sweden AB"));
     QCoreApplication::setOrganizationDomain(QStringLiteral("luxoft.com"));
@@ -71,7 +70,7 @@ int main(int argc, char *argv[])
     engine.addImportPath(QDir::currentPath()+QStringLiteral("/imports_shared/"));
     engine.rootContext()->setContextProperty(QStringLiteral("client"), &client);
     engine.rootContext()->setContextProperty("neptuneGitRevision", STR(NEPTUNE_GIT_REVISION));
-    engine.rootContext()->setContextProperty("qtiviVersion", QTIVICORE_VERSION_STR);
+    engine.rootContext()->setContextProperty("qtifVersion", QTINTERFACEFRAMEWORK_VERSION_STR);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty())
         return -1;
diff --git a/src/remotesettings/app/main.qml b/src/remotesettings/app/main.qml
index d677b1e4..aca9e857 100644
--- a/src/remotesettings/app/main.qml
+++ b/src/remotesettings/app/main.qml
@@ -32,8 +32,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import QtIvi 1.0
-import QtIvi.Media 1.0
+import QtInterfaceFramework
+import QtInterfaceFramework.Media
 import shared.com.pelagicore.remotesettings 1.0
 import shared.com.pelagicore.drivedata 1.0
 
@@ -93,11 +93,11 @@ ApplicationWindow {
 
         property bool isConnected: false
 
-        onIsInitializedChanged: {
+        onIsInitializedChanged: function(isInitialized) {
             isConnected = isInitialized;
         }
 
-        onErrorChanged: {
+        onErrorChanged: function(error) {
             if (error > 0) {
                 //Any other state then NoError=0
                 isConnected = false;
@@ -126,7 +126,7 @@ ApplicationWindow {
         lastUrls: client.lastUrls
         anchors.centerIn: parent
 
-        onAccepted: {
+        onAccepted: function(accepted) {
             if (accepted) {
                 client.connectToServer(url);
                 uiSettings.setServiceObject(null);
diff --git a/src/remotesettings/app/neptune-companion-app_wrapper.bat b/src/remotesettings/app/neptune-companion-app_wrapper.bat
index ef22de82..cee466e7 100644
--- a/src/remotesettings/app/neptune-companion-app_wrapper.bat
+++ b/src/remotesettings/app/neptune-companion-app_wrapper.bat
@@ -4,7 +4,7 @@
 :: Copyright (C) 2019 Luxoft Sweden AB
 :: Contact: https://www.qt.io/licensing/
 ::
-:: This file is part of the Neptune IVI UI.
+:: This file is part of the Neptune 3 UI.
 ::
 :: $QT_BEGIN_LICENSE:GPL-QTAS$
 :: Commercial License Usage
diff --git a/src/remotesettings/backend/backend.pro b/src/remotesettings/backend/backend.pro
index 689437fc..77141765 100644
--- a/src/remotesettings/backend/backend.pro
+++ b/src/remotesettings/backend/backend.pro
@@ -1,32 +1,32 @@
 TEMPLATE=lib
-TARGET = $$qt5LibraryTarget(remotesettings_backend_qtro, "plugins/qtivi/")
-CONFIG += ivigenerator plugin
+TARGET = $$qt5LibraryTarget(remotesettings_backend_qtro, "plugins/interfaceframework/")
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
+PLUGIN_TYPE = interfaceframework
+PLUGIN_EXTENDS = interfaceframework
 PLUGIN_CLASS_NAME = IviSettingsBackendInterface
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
diff --git a/src/remotesettings/backend_simulation/backend_simulation.pro b/src/remotesettings/backend_simulation/backend_simulation.pro
index b5ba75c7..78ca2cb6 100644
--- a/src/remotesettings/backend_simulation/backend_simulation.pro
+++ b/src/remotesettings/backend_simulation/backend_simulation.pro
@@ -1,32 +1,32 @@
 TEMPLATE=lib
 TARGET = $$qtLibraryTarget(remotesettings_backend_simulation)
-CONFIG += ivigenerator plugin
+CONFIG += ifcodegen plugin
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
-DESTDIR = $$BUILD_DIR/qtivi
+DESTDIR = $$BUILD_DIR/interfaceframework
 
 #needed for the android deployment to work
-android: DESTDIR = $$BUILD_DIR/plugins/qtivi
+android: DESTDIR = $$BUILD_DIR/plugins/interfaceframework
 
 CONFIG += warn_off
 INCLUDEPATH += $$OUT_PWD/../frontend
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
+PLUGIN_TYPE = interfaceframework
+PLUGIN_EXTENDS = interfaceframework
 PLUGIN_CLASS_NAME = IviSettingsBackendInterface
 
-QT += core ivicore
+QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../backend
 
-QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/qtivi)
+QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$INSTALL_PREFIX/neptune3/interfaceframework)
 
-target.path = $$INSTALL_PREFIX/neptune3/qtivi
+target.path = $$INSTALL_PREFIX/neptune3/interfaceframework
 INSTALLS += target
diff --git a/src/remotesettings/frontend/frontend.pro b/src/remotesettings/frontend/frontend.pro
index ef2f653c..e8b30a18 100644
--- a/src/remotesettings/frontend/frontend.pro
+++ b/src/remotesettings/frontend/frontend.pro
@@ -1,19 +1,19 @@
 TARGET = $$qtLibraryTarget(remotesettings)
 TEMPLATE = lib
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 DESTDIR = $$LIB_DESTDIR
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
 include($$SOURCE_DIR/config.pri)
 
 DEFINES += QT_BUILD_REMOTESETTINGS_LIB
-QT += ivicore ivicore-private qml
+QT += interfaceframework interfaceframework-private qml
 
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 DEPENDPATH += $$OUT_PWD/../frontend
 
diff --git a/src/remotesettings/qml_plugin/qml_plugin.pro b/src/remotesettings/qml_plugin/qml_plugin.pro
index 741a55ca..13c8a38e 100644
--- a/src/remotesettings/qml_plugin/qml_plugin.pro
+++ b/src/remotesettings/qml_plugin/qml_plugin.pro
@@ -4,15 +4,15 @@ QT += qml
 LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
-load(ivigenerator)
+load(ifcodegen)
 
 # the qmlplugin template provides the URI variable to read the uri from the qface files, but this
 # already contains the shared prefix, and the qmlplugin prf adds one as well
diff --git a/src/remotesettings/remotesettings-server/remotesettings-server.pro b/src/remotesettings/remotesettings-server/remotesettings-server.pro
index 9c0f6904..30c71238 100644
--- a/src/remotesettings/remotesettings-server/remotesettings-server.pro
+++ b/src/remotesettings/remotesettings-server/remotesettings-server.pro
@@ -2,15 +2,15 @@ QT -= gui
 
 CONFIG += c++11 console
 macos: CONFIG -= app_bundle
-CONFIG += ivigenerator
+CONFIG += ifcodegen
 
-QT_FOR_CONFIG += ivicore
-!qtConfig(ivigenerator): error("No ivigenerator available: Make sure QtIvi is installed and configured correctly")
+QT_FOR_CONFIG += interfaceframework
+!qtConfig(ifcodegen): error("No ifcodegen available: Make sure QtInterfaceFramework is installed and configured correctly")
 
 include($$SOURCE_DIR/config.pri)
 
-QFACE_FORMAT = server_qtro
-QFACE_SOURCES = ../remotesettings.qface
+IFCODEGEN_TEMPLATE = server_qtro
+IFCODEGEN_SOURCES = ../remotesettings.qface
 
 SOURCES += \
     main.cpp\