diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/core/core.pro | 2 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro (renamed from examples/qface-ivi-climate/backend_simulator/backend_simulator.pro) | 11 | ||||
-rwxr-xr-x | examples/core/qface-ivi-climate/build.sh (renamed from examples/qface-ivi-climate/build.sh) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/demo.pro (renamed from examples/qface-ivi-climate/demo/demo.pro) | 6 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/main.cpp (renamed from examples/qface-ivi-climate/demo/main.cpp) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/main.qml (renamed from examples/qface-ivi-climate/demo/main.qml) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/demo/qml.qrc (renamed from examples/qface-ivi-climate/demo/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/example-ivi-climate.qface (renamed from examples/qface-ivi-climate/qface-ivi-climate.qface) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/example-ivi-climate.yaml (renamed from examples/qface-ivi-climate/qface-ivi-climate.yaml) | 0 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/frontend/frontend.pro (renamed from examples/qface-ivi-climate/frontend/frontend.pro) | 6 | ||||
-rw-r--r-- | examples/core/qface-ivi-climate/qface-ivi-climate.pro (renamed from examples/qface-ivi-climate/qface-ivi-climate.pro) | 4 | ||||
-rw-r--r-- | examples/examples.pro | 1 |
12 files changed, 21 insertions, 9 deletions
diff --git a/examples/core/core.pro b/examples/core/core.pro new file mode 100644 index 0000000..a8ebdd1 --- /dev/null +++ b/examples/core/core.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = qface-ivi-climate diff --git a/examples/qface-ivi-climate/backend_simulator/backend_simulator.pro b/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro index 53b64de..c0bc8a1 100644 --- a/examples/qface-ivi-climate/backend_simulator/backend_simulator.pro +++ b/examples/core/qface-ivi-climate/backend_simulator/backend_simulator.pro @@ -48,14 +48,19 @@ TEMPLATE=lib TARGET = example_ivi_climate -LIBS += -L../frontend -lQtIviClimateExample +CONFIG += ivigenerator +LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample CONFIG += warn_off -INCLUDEPATH += ../frontend +INCLUDEPATH += $$OUT_PWD/../frontend PLUGIN_TYPE = qtivi PLUGIN_EXTENDS = qtivi PLUGIN_CLASS_NAME = ClimatePlugin QT += core ivicore -include(example-ivi-climate.pri) +QFACE_FORMAT = backend_simulator +QFACE_SOURCES = ../example-ivi-climate.qface + +target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/backend_simulator +INSTALLS += target diff --git a/examples/qface-ivi-climate/build.sh b/examples/core/qface-ivi-climate/build.sh index f61aabe..f61aabe 100755 --- a/examples/qface-ivi-climate/build.sh +++ b/examples/core/qface-ivi-climate/build.sh diff --git a/examples/qface-ivi-climate/demo/demo.pro b/examples/core/qface-ivi-climate/demo/demo.pro index deff433..857e9d4 100644 --- a/examples/qface-ivi-climate/demo/demo.pro +++ b/examples/core/qface-ivi-climate/demo/demo.pro @@ -51,8 +51,8 @@ TEMPLATE = app QT += qml quick CONFIG += c++11 -LIBS += -L../frontend -lQtIviClimateExample -INCLUDEPATH += ../frontend +LIBS += -L$$OUT_PWD/../frontend -lQtIviClimateExample +INCLUDEPATH += $$OUT_PWD/../frontend SOURCES += main.cpp @@ -75,5 +75,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]/qface/demo +target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/demo INSTALLS += target diff --git a/examples/qface-ivi-climate/demo/main.cpp b/examples/core/qface-ivi-climate/demo/main.cpp index 245bb26..245bb26 100644 --- a/examples/qface-ivi-climate/demo/main.cpp +++ b/examples/core/qface-ivi-climate/demo/main.cpp diff --git a/examples/qface-ivi-climate/demo/main.qml b/examples/core/qface-ivi-climate/demo/main.qml index ad496d9..ad496d9 100644 --- a/examples/qface-ivi-climate/demo/main.qml +++ b/examples/core/qface-ivi-climate/demo/main.qml diff --git a/examples/qface-ivi-climate/demo/qml.qrc b/examples/core/qface-ivi-climate/demo/qml.qrc index 5f6483a..5f6483a 100644 --- a/examples/qface-ivi-climate/demo/qml.qrc +++ b/examples/core/qface-ivi-climate/demo/qml.qrc diff --git a/examples/qface-ivi-climate/qface-ivi-climate.qface b/examples/core/qface-ivi-climate/example-ivi-climate.qface index 17bca97..17bca97 100644 --- a/examples/qface-ivi-climate/qface-ivi-climate.qface +++ b/examples/core/qface-ivi-climate/example-ivi-climate.qface diff --git a/examples/qface-ivi-climate/qface-ivi-climate.yaml b/examples/core/qface-ivi-climate/example-ivi-climate.yaml index d9efb89..d9efb89 100644 --- a/examples/qface-ivi-climate/qface-ivi-climate.yaml +++ b/examples/core/qface-ivi-climate/example-ivi-climate.yaml diff --git a/examples/qface-ivi-climate/frontend/frontend.pro b/examples/core/qface-ivi-climate/frontend/frontend.pro index 36dda15..22a754c 100644 --- a/examples/qface-ivi-climate/frontend/frontend.pro +++ b/examples/core/qface-ivi-climate/frontend/frontend.pro @@ -48,7 +48,11 @@ TARGET = QtIviClimateExample TEMPLATE = lib +CONFIG += ivigenerator QT += ivicore ivicore-private qml quick -include(example-ivi-climate.pri) +QFACE_SOURCES = ../example-ivi-climate.qface + +target.path = $$[QT_INSTALL_EXAMPLES]/core/qface-ivi-climate/frontend +INSTALLS += target diff --git a/examples/qface-ivi-climate/qface-ivi-climate.pro b/examples/core/qface-ivi-climate/qface-ivi-climate.pro index 417dbc4..07bc50c 100644 --- a/examples/qface-ivi-climate/qface-ivi-climate.pro +++ b/examples/core/qface-ivi-climate/qface-ivi-climate.pro @@ -55,5 +55,5 @@ SUBDIRS = frontend \ CONFIG += ordered OTHER_FILES += \ - qface-ivi-climate.qface \ - qface-ivi-climate.yaml + example-ivi-climate.qface \ + example-ivi-climate.yaml diff --git a/examples/examples.pro b/examples/examples.pro index e689d54..d58eb45 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs +SUBDIRS += core qtHaveModule(ivivehiclefunctions): SUBDIRS += vehiclefunctions qtHaveModule(ivimedia): SUBDIRS += media qtHaveModule(geniviextras): SUBDIRS += geniviextras |