summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-11-03 11:02:29 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-11-03 10:14:19 +0000
commit705acb8d595d772778dd4985b762ed6a604473d9 (patch)
tree03ebbf68ab7e6cf779cfd1226c766d01084c1b94 /examples
parentfb338368765f60c48d2b44abbad8b4c9fb6751eb (diff)
downloadqtivi-705acb8d595d772778dd4985b762ed6a604473d9.tar.gz
Change the examples folder structure to match the module naming
core -> ivicore media -> ivimedia vehiclefunctions -> ivivehiclefunctions Change-Id: Icd8d7c45f2dbf0e18de1eea775398b45f8ff78f8 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro6
-rw-r--r--examples/ivicore/ivicore.pro (renamed from examples/core/core.pro)0
-rw-r--r--examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro (renamed from examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro)2
-rwxr-xr-xexamples/ivicore/qface-ivi-climate/build.sh (renamed from examples/core/qface-ivi-climate/build.sh)0
-rw-r--r--examples/ivicore/qface-ivi-climate/demo/demo.pro (renamed from examples/core/qface-ivi-climate/demo/demo.pro)2
-rw-r--r--examples/ivicore/qface-ivi-climate/demo/main.cpp (renamed from examples/core/qface-ivi-climate/demo/main.cpp)0
-rw-r--r--examples/ivicore/qface-ivi-climate/demo/main.qml (renamed from examples/core/qface-ivi-climate/demo/main.qml)0
-rw-r--r--examples/ivicore/qface-ivi-climate/demo/qml.qrc (renamed from examples/core/qface-ivi-climate/demo/qml.qrc)0
-rw-r--r--examples/ivicore/qface-ivi-climate/example-ivi-climate.qface (renamed from examples/core/qface-ivi-climate/example-ivi-climate.qface)0
-rw-r--r--examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml (renamed from examples/core/qface-ivi-climate/example-ivi-climate.yaml)0
-rw-r--r--examples/ivicore/qface-ivi-climate/frontend/frontend.pro (renamed from examples/core/qface-ivi-climate/frontend/frontend.pro)2
-rw-r--r--examples/ivicore/qface-ivi-climate/qface-ivi-climate.pro (renamed from examples/core/qface-ivi-climate/qface-ivi-climate.pro)0
-rw-r--r--examples/ivimedia/ivimedia.pro (renamed from examples/media/media.pro)0
-rw-r--r--examples/ivimedia/mediaplayer/main.cpp (renamed from examples/media/mediaplayer/main.cpp)0
-rw-r--r--examples/ivimedia/mediaplayer/main.qml (renamed from examples/media/mediaplayer/main.qml)0
-rw-r--r--examples/ivimedia/mediaplayer/mediaplayer.pro (renamed from examples/media/mediaplayer/mediaplayer.pro)2
-rw-r--r--examples/ivimedia/mediaplayer/qml.qrc (renamed from examples/media/mediaplayer/qml.qrc)0
-rw-r--r--examples/ivimedia/tuner/main.cpp (renamed from examples/media/tuner/main.cpp)0
-rw-r--r--examples/ivimedia/tuner/main.qml (renamed from examples/media/tuner/main.qml)0
-rw-r--r--examples/ivimedia/tuner/qml.qrc (renamed from examples/media/tuner/qml.qrc)0
-rw-r--r--examples/ivimedia/tuner/tuner.pro (renamed from examples/media/tuner/tuner.pro)2
-rw-r--r--examples/ivivehiclefunctions/climate_qml/climate_qml.pro (renamed from examples/vehiclefunctions/climate_qml/climate_qml.pro)2
-rw-r--r--examples/ivivehiclefunctions/climate_qml/main.cpp (renamed from examples/vehiclefunctions/climate_qml/main.cpp)0
-rw-r--r--examples/ivivehiclefunctions/climate_qml/main.qml (renamed from examples/vehiclefunctions/climate_qml/main.qml)0
-rw-r--r--examples/ivivehiclefunctions/climate_qml/qml.qrc (renamed from examples/vehiclefunctions/climate_qml/qml.qrc)0
-rw-r--r--examples/ivivehiclefunctions/climate_widget/climate_widget.pro (renamed from examples/vehiclefunctions/climate_widget/climate_widget.pro)2
-rw-r--r--examples/ivivehiclefunctions/climate_widget/main.cpp (renamed from examples/vehiclefunctions/climate_widget/main.cpp)0
-rw-r--r--examples/ivivehiclefunctions/climate_widget/mainwindow.cpp (renamed from examples/vehiclefunctions/climate_widget/mainwindow.cpp)0
-rw-r--r--examples/ivivehiclefunctions/climate_widget/mainwindow.h (renamed from examples/vehiclefunctions/climate_widget/mainwindow.h)0
-rw-r--r--examples/ivivehiclefunctions/climate_widget/mainwindow.ui (renamed from examples/vehiclefunctions/climate_widget/mainwindow.ui)0
-rw-r--r--examples/ivivehiclefunctions/ivivehiclefunctions.pro (renamed from examples/vehiclefunctions/vehiclefunctions.pro)0
-rw-r--r--examples/ivivehiclefunctions/window_qml/WindowItem.qml (renamed from examples/vehiclefunctions/window_qml/WindowItem.qml)0
-rw-r--r--examples/ivivehiclefunctions/window_qml/main.cpp (renamed from examples/vehiclefunctions/window_qml/main.cpp)0
-rw-r--r--examples/ivivehiclefunctions/window_qml/main.qml (renamed from examples/vehiclefunctions/window_qml/main.qml)0
-rw-r--r--examples/ivivehiclefunctions/window_qml/qml.qrc (renamed from examples/vehiclefunctions/window_qml/qml.qrc)0
-rw-r--r--examples/ivivehiclefunctions/window_qml/window_qml.pro (renamed from examples/vehiclefunctions/window_qml/window_qml.pro)2
36 files changed, 11 insertions, 11 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index d58eb45..9ac0612 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
-SUBDIRS += core
-qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions
-qtHaveModule(ivimedia): SUBDIRS += media
+SUBDIRS += ivicore
+qtHaveModule(ivivehiclefunctions): SUBDIRS += ivivehiclefunctions
+qtHaveModule(ivimedia): SUBDIRS += ivimedia
qtHaveModule(geniviextras): SUBDIRS += geniviextras
diff --git a/examples/core/core.pro b/examples/ivicore/ivicore.pro
index 14dc55e..14dc55e 100644
--- a/examples/core/core.pro
+++ b/examples/ivicore/ivicore.pro
diff --git a/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro
index 23c1bbf..4903be3 100644
--- a/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro
+++ b/examples/ivicore/qface-ivi-climate/backend_simulator/backend_simulator.pro
@@ -65,5 +65,5 @@ QT += core ivicore
QFACE_FORMAT = backend_simulator
QFACE_SOURCES = ../example-ivi-climate.qface
-target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/backend_simulator
+target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/backend_simulator
INSTALLS += target
diff --git a/examples/core/qface-ivi-climate/build.sh b/examples/ivicore/qface-ivi-climate/build.sh
index f61aabe..f61aabe 100755
--- a/examples/core/qface-ivi-climate/build.sh
+++ b/examples/ivicore/qface-ivi-climate/build.sh
diff --git a/examples/core/qface-ivi-climate/demo/demo.pro b/examples/ivicore/qface-ivi-climate/demo/demo.pro
index 980bf42..eee92c5 100644
--- a/examples/core/qface-ivi-climate/demo/demo.pro
+++ b/examples/ivicore/qface-ivi-climate/demo/demo.pro
@@ -78,5 +78,5 @@ DEFINES += QT_DEPRECATED_WARNINGS
# You can also select to disable deprecated APIs only up to a certain version of Qt.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/demo
+target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/demo
INSTALLS += target
diff --git a/examples/core/qface-ivi-climate/demo/main.cpp b/examples/ivicore/qface-ivi-climate/demo/main.cpp
index 245bb26..245bb26 100644
--- a/examples/core/qface-ivi-climate/demo/main.cpp
+++ b/examples/ivicore/qface-ivi-climate/demo/main.cpp
diff --git a/examples/core/qface-ivi-climate/demo/main.qml b/examples/ivicore/qface-ivi-climate/demo/main.qml
index a8255db..a8255db 100644
--- a/examples/core/qface-ivi-climate/demo/main.qml
+++ b/examples/ivicore/qface-ivi-climate/demo/main.qml
diff --git a/examples/core/qface-ivi-climate/demo/qml.qrc b/examples/ivicore/qface-ivi-climate/demo/qml.qrc
index 5f6483a..5f6483a 100644
--- a/examples/core/qface-ivi-climate/demo/qml.qrc
+++ b/examples/ivicore/qface-ivi-climate/demo/qml.qrc
diff --git a/examples/core/qface-ivi-climate/example-ivi-climate.qface b/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface
index ec99060..ec99060 100644
--- a/examples/core/qface-ivi-climate/example-ivi-climate.qface
+++ b/examples/ivicore/qface-ivi-climate/example-ivi-climate.qface
diff --git a/examples/core/qface-ivi-climate/example-ivi-climate.yaml b/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml
index f114ef0..f114ef0 100644
--- a/examples/core/qface-ivi-climate/example-ivi-climate.yaml
+++ b/examples/ivicore/qface-ivi-climate/example-ivi-climate.yaml
diff --git a/examples/core/qface-ivi-climate/frontend/frontend.pro b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro
index 7e11573..2fae531 100644
--- a/examples/core/qface-ivi-climate/frontend/frontend.pro
+++ b/examples/ivicore/qface-ivi-climate/frontend/frontend.pro
@@ -58,5 +58,5 @@ DEFINES += QT_BUILD_CLIMATE_LIB
QFACE_SOURCES = ../example-ivi-climate.qface
-target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/frontend
+target.path = $$[QT_INSTALL_EXAMPLES]/ivicore/qface-ivi-climate/frontend
INSTALLS += target
diff --git a/examples/core/qface-ivi-climate/qface-ivi-climate.pro b/examples/ivicore/qface-ivi-climate/qface-ivi-climate.pro
index 07bc50c..07bc50c 100644
--- a/examples/core/qface-ivi-climate/qface-ivi-climate.pro
+++ b/examples/ivicore/qface-ivi-climate/qface-ivi-climate.pro
diff --git a/examples/media/media.pro b/examples/ivimedia/ivimedia.pro
index ab7c158..ab7c158 100644
--- a/examples/media/media.pro
+++ b/examples/ivimedia/ivimedia.pro
diff --git a/examples/media/mediaplayer/main.cpp b/examples/ivimedia/mediaplayer/main.cpp
index 6c358bf..6c358bf 100644
--- a/examples/media/mediaplayer/main.cpp
+++ b/examples/ivimedia/mediaplayer/main.cpp
diff --git a/examples/media/mediaplayer/main.qml b/examples/ivimedia/mediaplayer/main.qml
index 826d5a6..826d5a6 100644
--- a/examples/media/mediaplayer/main.qml
+++ b/examples/ivimedia/mediaplayer/main.qml
diff --git a/examples/media/mediaplayer/mediaplayer.pro b/examples/ivimedia/mediaplayer/mediaplayer.pro
index 25cd849..29517aa 100644
--- a/examples/media/mediaplayer/mediaplayer.pro
+++ b/examples/ivimedia/mediaplayer/mediaplayer.pro
@@ -12,5 +12,5 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/media/mediaplayer
+target.path = $$[QT_INSTALL_EXAMPLES]/ivimedia/mediaplayer
INSTALLS += target
diff --git a/examples/media/mediaplayer/qml.qrc b/examples/ivimedia/mediaplayer/qml.qrc
index 5f6483a..5f6483a 100644
--- a/examples/media/mediaplayer/qml.qrc
+++ b/examples/ivimedia/mediaplayer/qml.qrc
diff --git a/examples/media/tuner/main.cpp b/examples/ivimedia/tuner/main.cpp
index 6c358bf..6c358bf 100644
--- a/examples/media/tuner/main.cpp
+++ b/examples/ivimedia/tuner/main.cpp
diff --git a/examples/media/tuner/main.qml b/examples/ivimedia/tuner/main.qml
index d44c77d..d44c77d 100644
--- a/examples/media/tuner/main.qml
+++ b/examples/ivimedia/tuner/main.qml
diff --git a/examples/media/tuner/qml.qrc b/examples/ivimedia/tuner/qml.qrc
index 5f6483a..5f6483a 100644
--- a/examples/media/tuner/qml.qrc
+++ b/examples/ivimedia/tuner/qml.qrc
diff --git a/examples/media/tuner/tuner.pro b/examples/ivimedia/tuner/tuner.pro
index f8ac5ed..510cf6e 100644
--- a/examples/media/tuner/tuner.pro
+++ b/examples/ivimedia/tuner/tuner.pro
@@ -12,5 +12,5 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/media/tuner
+target.path = $$[QT_INSTALL_EXAMPLES]/ivimedia/tuner
INSTALLS += target
diff --git a/examples/vehiclefunctions/climate_qml/climate_qml.pro b/examples/ivivehiclefunctions/climate_qml/climate_qml.pro
index 485158b..07ba83d 100644
--- a/examples/vehiclefunctions/climate_qml/climate_qml.pro
+++ b/examples/ivivehiclefunctions/climate_qml/climate_qml.pro
@@ -10,5 +10,5 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/vehiclefunctions/climate_qml
+target.path = $$[QT_INSTALL_EXAMPLES]/ivivehiclefunctions/climate_qml
INSTALLS += target
diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/ivivehiclefunctions/climate_qml/main.cpp
index 6c358bf..6c358bf 100644
--- a/examples/vehiclefunctions/climate_qml/main.cpp
+++ b/examples/ivivehiclefunctions/climate_qml/main.cpp
diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/ivivehiclefunctions/climate_qml/main.qml
index 3dc8c6f..3dc8c6f 100644
--- a/examples/vehiclefunctions/climate_qml/main.qml
+++ b/examples/ivivehiclefunctions/climate_qml/main.qml
diff --git a/examples/vehiclefunctions/climate_qml/qml.qrc b/examples/ivivehiclefunctions/climate_qml/qml.qrc
index 5f6483a..5f6483a 100644
--- a/examples/vehiclefunctions/climate_qml/qml.qrc
+++ b/examples/ivivehiclefunctions/climate_qml/qml.qrc
diff --git a/examples/vehiclefunctions/climate_widget/climate_widget.pro b/examples/ivivehiclefunctions/climate_widget/climate_widget.pro
index b9ae89f..b64c5b2 100644
--- a/examples/vehiclefunctions/climate_widget/climate_widget.pro
+++ b/examples/ivivehiclefunctions/climate_widget/climate_widget.pro
@@ -15,5 +15,5 @@ HEADERS += mainwindow.h
FORMS += mainwindow.ui
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/vehiclefunctions/climate_widget
+target.path = $$[QT_INSTALL_EXAMPLES]/ivivehiclefunctions/climate_widget
INSTALLS += target
diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/ivivehiclefunctions/climate_widget/main.cpp
index db4b57b..db4b57b 100644
--- a/examples/vehiclefunctions/climate_widget/main.cpp
+++ b/examples/ivivehiclefunctions/climate_widget/main.cpp
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp
index 9e46a87..9e46a87 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/ivivehiclefunctions/climate_widget/mainwindow.cpp
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/ivivehiclefunctions/climate_widget/mainwindow.h
index a7e0cd1..a7e0cd1 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/ivivehiclefunctions/climate_widget/mainwindow.h
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.ui b/examples/ivivehiclefunctions/climate_widget/mainwindow.ui
index 7f53ae2..7f53ae2 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.ui
+++ b/examples/ivivehiclefunctions/climate_widget/mainwindow.ui
diff --git a/examples/vehiclefunctions/vehiclefunctions.pro b/examples/ivivehiclefunctions/ivivehiclefunctions.pro
index 121e7e3..121e7e3 100644
--- a/examples/vehiclefunctions/vehiclefunctions.pro
+++ b/examples/ivivehiclefunctions/ivivehiclefunctions.pro
diff --git a/examples/vehiclefunctions/window_qml/WindowItem.qml b/examples/ivivehiclefunctions/window_qml/WindowItem.qml
index 3212e71..3212e71 100644
--- a/examples/vehiclefunctions/window_qml/WindowItem.qml
+++ b/examples/ivivehiclefunctions/window_qml/WindowItem.qml
diff --git a/examples/vehiclefunctions/window_qml/main.cpp b/examples/ivivehiclefunctions/window_qml/main.cpp
index 6c358bf..6c358bf 100644
--- a/examples/vehiclefunctions/window_qml/main.cpp
+++ b/examples/ivivehiclefunctions/window_qml/main.cpp
diff --git a/examples/vehiclefunctions/window_qml/main.qml b/examples/ivivehiclefunctions/window_qml/main.qml
index 6e2f662..6e2f662 100644
--- a/examples/vehiclefunctions/window_qml/main.qml
+++ b/examples/ivivehiclefunctions/window_qml/main.qml
diff --git a/examples/vehiclefunctions/window_qml/qml.qrc b/examples/ivivehiclefunctions/window_qml/qml.qrc
index 4bb0efb..4bb0efb 100644
--- a/examples/vehiclefunctions/window_qml/qml.qrc
+++ b/examples/ivivehiclefunctions/window_qml/qml.qrc
diff --git a/examples/vehiclefunctions/window_qml/window_qml.pro b/examples/ivivehiclefunctions/window_qml/window_qml.pro
index 828d397..98368a3 100644
--- a/examples/vehiclefunctions/window_qml/window_qml.pro
+++ b/examples/ivivehiclefunctions/window_qml/window_qml.pro
@@ -10,5 +10,5 @@ RESOURCES += qml.qrc
QML_IMPORT_PATH =
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/vehiclefunctions/window_qml
+target.path = $$[QT_INSTALL_EXAMPLES]/ivivehiclefunctions/window_qml
INSTALLS += target