summaryrefslogtreecommitdiffstats
path: root/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2021-07-05 16:06:46 +0200
committerDominik Holland <dominik.holland@qt.io>2021-07-05 22:34:04 +0200
commit1695239cef202fa75dbe9bb86e690b7f5e10874e (patch)
treec0c214b8d6c89c4855e705f37e7972ff24546c22 /examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior
parentc0ce835d5c4b02b889bd8c2f118fa29f2249eb28 (diff)
ifcodegen: Streamline the naming for the various input variables
All qmake variables which were previously prefixed with QFACE_ are now prefixed with IFCODEGEN_ to match the new name of the generator and also match the prf file name. The --format argument of the generator (QFACE_FORMAT) will be renamed to --template and the new qmake variable name is IFCODEGEN_TEMPLATE. Change-Id: If5166091335bd12f71c82ffb93f9de3c6a60c92f Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior')
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt4
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro4
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt4
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro2
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt4
-rw-r--r--examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro4
6 files changed, 11 insertions, 11 deletions
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
index 21615ba4..7fc88b86 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_chapter4_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY
# Interface Framework Generator:
qt6_ifcodegen(ic_chapter4_simulation
- QFACE_SOURCES ../instrument-cluster.qface
- QFACE_FORMAT backend_simulator
+ IFCODEGEN_SOURCES ../instrument-cluster.qface
+ IFCODEGEN_TEMPLATE backend_simulator
)
target_link_libraries(ic_chapter4_simulation PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
index 367f6c9d..abd8bd7a 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
INCLUDEPATH += $$OUT_PWD/../frontend
QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
PLUGIN_TYPE = interfaceframework
RESOURCES += \
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
index a3425cff..ae384b55 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter4 PROPERTIES RUNTIME_OUTPUT_D
# Interface Framework Generator:
qt6_ifcodegen(QtIfInstrumentCluster_Chapter4
- QFACE_SOURCES ../instrument-cluster.qface
- QFACE_FORMAT frontend
+ IFCODEGEN_SOURCES ../instrument-cluster.qface
+ IFCODEGEN_TEMPLATE frontend
)
target_include_directories(QtIfInstrumentCluster_Chapter4 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
index da91fe7b..bcd4adfa 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
CONFIG += install_ok # Do not cargo-cult this!
target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter4-simulation-behavior
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
index c0a5804d..40431d95 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
@@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework)
# Interface Framework Generator:
qt6_ifcodegen(instrument_cluster_chapter4_imports # special case
- QFACE_SOURCES ../instrument-cluster.qface
- QFACE_FORMAT qmlplugin
+ IFCODEGEN_SOURCES ../instrument-cluster.qface
+ IFCODEGEN_TEMPLATE qmlplugin
)
target_link_libraries(instrument_cluster_chapter4_imports PUBLIC # special case
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
index fd6284c7..85457130 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
@@ -5,8 +5,8 @@ QT += interfaceframework
LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
INCLUDEPATH += $$OUT_PWD/../frontend
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
load(ifcodegen)