summaryrefslogtreecommitdiff
path: root/src/plugins/ivivehiclefunctions
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2019-03-04 17:12:26 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2019-03-14 10:11:16 +0000
commit5d1fd69f30a9927a7422fe78231dfb7e395fcf82 (patch)
tree7b09438d473ff38d488f5db49d24f07e2fe1ff4b /src/plugins/ivivehiclefunctions
parent657fc760bb293856b858a0ff1f6fac4fadf3c1df (diff)
downloadqtivi-5d1fd69f30a9927a7422fe78231dfb7e395fcf82.tar.gz
Move the vehiclefunctions plugin into a sub-folder
Change-Id: I59952b0acec3cbba96290eb8139bad3ecd3db6fa Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/plugins/ivivehiclefunctions')
-rw-r--r--src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro22
-rw-r--r--src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/QIviConcreteWindowControlSimulation.qml (renamed from src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml)0
-rw-r--r--src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/qml.qrc (renamed from src/plugins/ivivehiclefunctions/qml.qrc)0
-rw-r--r--src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/simulation.qml (renamed from src/plugins/ivivehiclefunctions/simulation.qml)0
-rw-r--r--src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro21
5 files changed, 24 insertions, 19 deletions
diff --git a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
index 400191c..1a439a7 100644
--- a/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
+++ b/src/plugins/ivivehiclefunctions/ivivehiclefunctions.pro
@@ -1,25 +1,9 @@
-TARGET = vehiclefunction_simulator
+TEMPLATE = subdirs
-QT += core ivicore ivivehiclefunctions
-CONFIG += c++11 ivigenerator
+QT_FOR_CONFIG += ivivehiclefunctions-private
-CMAKE_MODULE_TESTS = '-'
-
-QFACE_FORMAT = backend_simulator
-QFACE_MODULE_NAME = QtIviVehicleFunctions
-QFACE_SOURCES += ../../ivivehiclefunctions/ivivehiclefunctions.qface
+qtConfig(vehiclefunctions_simulation_backend): SUBDIRS += vehiclefunctions_simulator
OTHER_FILES += \
$$PWD/doc/*.qdocconf \
$$PWD/doc/src/*.qdoc
-
-PLUGIN_TYPE = qtivi
-PLUGIN_EXTENDS = ivivehiclefunctions
-PLUGIN_CLASS_NAME = QtIviVehicleFunctionsPlugin
-
-load(qt_plugin)
-
-RESOURCES += \
- qml.qrc
-
-QML_IMPORT_PATH = $$OUT_PWD/qml
diff --git a/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/QIviConcreteWindowControlSimulation.qml
index d0f2bde..d0f2bde 100644
--- a/src/plugins/ivivehiclefunctions/QIviConcreteWindowControlSimulation.qml
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/QIviConcreteWindowControlSimulation.qml
diff --git a/src/plugins/ivivehiclefunctions/qml.qrc b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/qml.qrc
index b94e5bf..b94e5bf 100644
--- a/src/plugins/ivivehiclefunctions/qml.qrc
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/qml.qrc
diff --git a/src/plugins/ivivehiclefunctions/simulation.qml b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/simulation.qml
index e1e67f6..e1e67f6 100644
--- a/src/plugins/ivivehiclefunctions/simulation.qml
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/simulation.qml
diff --git a/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
new file mode 100644
index 0000000..90256dc
--- /dev/null
+++ b/src/plugins/ivivehiclefunctions/vehiclefunctions_simulator/vehiclefunctions_simulator.pro
@@ -0,0 +1,21 @@
+TARGET = vehiclefunction_simulator
+
+QT += core ivicore ivivehiclefunctions
+CONFIG += c++11 ivigenerator
+
+CMAKE_MODULE_TESTS = '-'
+
+QFACE_FORMAT = backend_simulator
+QFACE_MODULE_NAME = QtIviVehicleFunctions
+QFACE_SOURCES += ../../../ivivehiclefunctions/ivivehiclefunctions.qface
+
+PLUGIN_TYPE = qtivi
+PLUGIN_EXTENDS = ivivehiclefunctions
+PLUGIN_CLASS_NAME = QtIviVehicleFunctionsPlugin
+
+load(qt_plugin)
+
+RESOURCES += \
+ qml.qrc
+
+QML_IMPORT_PATH = $$OUT_PWD/qml