Fix some pro and qrc files to get rid of cmake conversion warnings

Also delete orphan pro file in one of the ivigenerator templates

Change-Id: I115ebe504344269c1554b6396df545467f5b0a59
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

10 files changed, 2 insertions, 78 deletions

diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.gen.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.gen.txt
deleted file mode 100644
index f88a4cc..0000000
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.gen.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from backend_simulator.pro.
-
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qrc b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qrc
index d2b5685..64b8d04 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qrc
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/simulation.qrc
@@ -1,5 +1,4 @@
 <RCC>
-    <qresource prefix="/simulation"/>
     <qresource prefix="/">
         <file>simulation.qml</file>
     </qresource>
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.gen.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.gen.txt
deleted file mode 100644
index f88a4cc..0000000
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.gen.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from backend_simulator.pro.
-
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qrc b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qrc
index d2b5685..64b8d04 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qrc
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/simulation.qrc
@@ -1,5 +1,4 @@
 <RCC>
-    <qresource prefix="/simulation"/>
     <qresource prefix="/">
         <file>simulation.qml</file>
     </qresource>
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.gen.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.gen.txt
deleted file mode 100644
index af9334a..0000000
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.gen.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from simulation_server.pro.
-
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.gen.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.gen.txt
deleted file mode 100644
index f88a4cc..0000000
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.gen.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from backend_simulator.pro.
-
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qrc b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qrc
index d2b5685..64b8d04 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qrc
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/simulation.qrc
@@ -1,5 +1,4 @@
 <RCC>
-    <qresource prefix="/simulation"/>
     <qresource prefix="/">
         <file>simulation.qml</file>
     </qresource>
diff --git a/src/imports/vehiclefunctions/CMakeLists.gen.txt b/src/imports/vehiclefunctions/CMakeLists.gen.txt
deleted file mode 100644
index ed27dcf..0000000
--- a/src/imports/vehiclefunctions/CMakeLists.gen.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated from vehiclefunctions.pro.
-
diff --git a/src/imports/vehiclefunctions/vehiclefunctions.pro b/src/imports/vehiclefunctions/vehiclefunctions.pro
index 7c9969c..09c2426 100644
--- a/src/imports/vehiclefunctions/vehiclefunctions.pro
+++ b/src/imports/vehiclefunctions/vehiclefunctions.pro
@@ -8,6 +8,8 @@ QFACE_MODULE_NAME = QtIviVehicleFunctions
 QFACE_FORMAT = qmlplugin
 QFACE_SOURCES = ../../ivivehiclefunctions/ivivehiclefunctions.qface
 
+QML_IMPORT_VERSION = 1.0
+
 load(ivigenerator)
 
 CXX_MODULE = qml
diff --git a/src/tools/ivigenerator/templates/backend_simulator/plugin.pro b/src/tools/ivigenerator/templates/backend_simulator/plugin.pro
deleted file mode 100644
index dd96eb2..0000000
--- a/src/tools/ivigenerator/templates/backend_simulator/plugin.pro
+++ /dev/null
@@ -1,65 +0,0 @@
-{#
-# Copyright (C) 2019 Luxoft Sweden AB
-# Copyright (C) 2018 Pelagicore AG
-# Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
-# Contact: https://www.qt.io/licensing/
-#
-# This file is part of the QtIvi module of the Qt Toolkit.
-#
-# $QT_BEGIN_LICENSE:LGPL-QTAS$
-# Commercial License Usage
-# Licensees holding valid commercial Qt Automotive Suite 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 Lesser General Public License Usage
-# Alternatively, this file may be used under the terms of the GNU Lesser
-# General Public License version 3 as published by the Free Software
-# Foundation and appearing in the file LICENSE.LGPL3 included in the
-# packaging of this file. Please review the following information to
-# ensure the GNU Lesser General Public License version 3 requirements
-# will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-#
-# GNU General Public License Usage
-# Alternatively, this file may be used under the terms of the GNU
-# General Public License version 2.0 or (at your option) the GNU General
-# Public license version 3 or any later version approved by the KDE Free
-# Qt Foundation. The licenses are as published by the Free Software
-# Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-# 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-2.0.html and
-# https://www.gnu.org/licenses/gpl-3.0.html.
-#
-# $QT_END_LICENSE$
-#
-# SPDX-License-Identifier: LGPL-3.0
-#}
-TARGET = {{module.module_name|lower}}_simulator
-
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = qtivi
-PLUGIN_CLASS_NAME = QIviServiceInterface
-
-QT       += core ivicore {{module|lower}}
-
-load(qt_plugin)
-
-
-SOURCES += {{module.module_name|lower}}plugin.cpp \
-{% for interface in module.interfaces %}
-    {{interface|lower}}backend.cpp {% if not loop.last %}\
-    {% endif%}
-{% endfor %}
-
-HEADERS += {{module.module_name|lower}}plugin.h \
-{% for interface in module.interfaces %}
-    {{interface|lower}}backend.h {% if not loop.last %}\
-    {% endif%}
-{% endfor %}
-
-DISTFILES += {{module.module_name|lower}}.json \
-             {{module.module_name|lower}}_simulation_data.json