diff options
author | Dominik Holland <dominik.holland@qt.io> | 2021-07-05 16:06:46 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2021-07-05 22:34:04 +0200 |
commit | 1695239cef202fa75dbe9bb86e690b7f5e10874e (patch) | |
tree | c0c214b8d6c89c4855e705f37e7972ff24546c22 /examples/interfaceframework | |
parent | c0ce835d5c4b02b889bd8c2f118fa29f2249eb28 (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')
46 files changed, 83 insertions, 83 deletions
diff --git a/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt index 76292fd6..af0eb724 100644 --- a/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(addressbook_backend_simulator PROPERTIES LIBRARY_OUTPUT_DI # Interface Framework Generator: qt6_ifcodegen(addressbook_backend_simulator - QFACE_SOURCES ../example-if-addressbook.qface - QFACE_FORMAT backend_simulator + IFCODEGEN_SOURCES ../example-if-addressbook.qface + IFCODEGEN_TEMPLATE backend_simulator ) target_link_libraries(addressbook_backend_simulator PUBLIC diff --git a/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro index ab022619..4dc8239b 100644 --- a/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro +++ b/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro @@ -11,8 +11,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend QT += core interfaceframework CONFIG += ifcodegen plugin -QFACE_FORMAT = backend_simulator -QFACE_SOURCES = ../example-if-addressbook.qface +IFCODEGEN_TEMPLATE = backend_simulator +IFCODEGEN_SOURCES = ../example-if-addressbook.qface PLUGIN_TYPE = interfaceframework PLUGIN_CLASS_NAME = AddressBookSimulatorPlugin diff --git a/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt index f852990a..53b4b007 100644 --- a/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt @@ -21,8 +21,8 @@ add_library(QtIfAdressBookExample) # Interface Framework Generator: qt6_ifcodegen(QtIfAdressBookExample - QFACE_SOURCES ../example-if-addressbook.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../example-if-addressbook.qface + IFCODEGEN_TEMPLATE frontend ) set_target_properties(QtIfAdressBookExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../) diff --git a/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro b/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro index 65f52c5c..5be3a8d8 100644 --- a/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro +++ b/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro @@ -8,7 +8,7 @@ QT += interfaceframework interfaceframework-private qml quick DEFINES += QT_BUILD_EXAMPLE_IF_ADDRESSBOOK_LIB CONFIG += ifcodegen -QFACE_SOURCES = ../example-if-addressbook.qface +IFCODEGEN_SOURCES = ../example-if-addressbook.qface CONFIG += install_ok # Do not cargo-cult this! target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-ifaddressbook INSTALLS += target diff --git a/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt index e0ea3b88..e7a67b20 100644 --- a/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(climate_backend_simulator PROPERTIES LIBRARY_OUTPUT_DIRECT # Interface Framework Generator: qt6_ifcodegen(climate_backend_simulator - QFACE_SOURCES ../example-if-climate.qface - QFACE_FORMAT backend_simulator + IFCODEGEN_SOURCES ../example-if-climate.qface + IFCODEGEN_TEMPLATE backend_simulator ) target_link_libraries(climate_backend_simulator PUBLIC diff --git a/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro index 3f7cce52..8f92435e 100644 --- a/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro +++ b/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro @@ -15,8 +15,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend QT += core interfaceframework #! [2] CONFIG += ifcodegen plugin -QFACE_FORMAT = backend_simulator -QFACE_SOURCES = ../example-if-climate.qface +IFCODEGEN_TEMPLATE = backend_simulator +IFCODEGEN_SOURCES = ../example-if-climate.qface PLUGIN_TYPE = interfaceframework PLUGIN_CLASS_NAME = ClimateSimulatorPlugin #! [2] diff --git a/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt index 5dfd37ea..f15370fb 100644 --- a/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt @@ -21,8 +21,8 @@ add_library(QtIfClimateExample) # Interface Framework Generator: qt6_ifcodegen(QtIfClimateExample - QFACE_SOURCES ../example-if-climate.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../example-if-climate.qface + IFCODEGEN_TEMPLATE frontend ) set_target_properties(QtIfClimateExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..) diff --git a/examples/interfaceframework/qface-if-climate/frontend/frontend.pro b/examples/interfaceframework/qface-if-climate/frontend/frontend.pro index 6982d34a..3513e5bb 100644 --- a/examples/interfaceframework/qface-if-climate/frontend/frontend.pro +++ b/examples/interfaceframework/qface-if-climate/frontend/frontend.pro @@ -11,7 +11,7 @@ QT += interfaceframework interfaceframework-private qml quick DEFINES += QT_BUILD_EXAMPLE_IF_CLIMATE_LIB #! [1] CONFIG += ifcodegen -QFACE_SOURCES = ../example-if-climate.qface +IFCODEGEN_SOURCES = ../example-if-climate.qface #! [1] CONFIG += install_ok # Do not cargo-cult this! target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-if-climate diff --git a/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt index 71b4e6e4..39a7c0ac 100644 --- a/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(remote_backend_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY .. # Interface Framework Generator: qt6_ifcodegen(remote_backend_qtro - QFACE_SOURCES ../example-if-remote.qface - QFACE_FORMAT backend_qtro + IFCODEGEN_SOURCES ../example-if-remote.qface + IFCODEGEN_TEMPLATE backend_qtro ) target_link_libraries(remote_backend_qtro PUBLIC diff --git a/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro b/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro index 098be885..be83f15e 100644 --- a/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro +++ b/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro @@ -15,8 +15,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend QT += core interfaceframework #! [2] CONFIG += ifcodegen plugin -QFACE_FORMAT = backend_qtro -QFACE_SOURCES = ../example-if-remote.qface +IFCODEGEN_TEMPLATE = backend_qtro +IFCODEGEN_SOURCES = ../example-if-remote.qface PLUGIN_TYPE = interfaceframework PLUGIN_CLASS_NAME = RemoteClientQtROPlugin #! [2] diff --git a/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt index a5ff165e..e951dc93 100644 --- a/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt @@ -25,8 +25,8 @@ add_library(QtIfRemoteExample) # Interface Framework Generator: qt6_ifcodegen(QtIfRemoteExample - QFACE_SOURCES ../example-if-remote.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../example-if-remote.qface + IFCODEGEN_TEMPLATE frontend ) set_target_properties(QtIfRemoteExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..) diff --git a/examples/interfaceframework/qface-if-remote/frontend/frontend.pro b/examples/interfaceframework/qface-if-remote/frontend/frontend.pro index c3119928..7aad23ef 100644 --- a/examples/interfaceframework/qface-if-remote/frontend/frontend.pro +++ b/examples/interfaceframework/qface-if-remote/frontend/frontend.pro @@ -11,7 +11,7 @@ QT += interfaceframework interfaceframework-private qml quick DEFINES += QT_BUILD_EXAMPLE_IF_REMOTE_LIB #! [1] CONFIG += ifcodegen -QFACE_SOURCES = ../example-if-remote.qface +IFCODEGEN_SOURCES = ../example-if-remote.qface #! [1] CONFIG += install_ok # Do not cargo-cult this! target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-if-remote diff --git a/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt index a65d8cb6..da362d7c 100644 --- a/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt +++ b/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt @@ -24,8 +24,8 @@ qt_add_executable(qface-if-remote-server # Interface Framework Generator: qt6_ifcodegen(qface-if-remote-server - QFACE_SOURCES ../example-if-remote.qface - QFACE_FORMAT server_qtro + IFCODEGEN_SOURCES ../example-if-remote.qface + IFCODEGEN_TEMPLATE server_qtro ) set_target_properties(qface-if-remote-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..) diff --git a/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro b/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro index ff4bf1b0..c89a77ce 100644 --- a/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro +++ b/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro @@ -15,8 +15,8 @@ SOURCES += main.cpp \ QMAKE_RPATHDIR += $ORIGIN #! [1] -QFACE_FORMAT = server_qtro -QFACE_SOURCES = ../example-if-remote.qface +IFCODEGEN_TEMPLATE = server_qtro +IFCODEGEN_SOURCES = ../example-if-remote.qface #! [1] # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff --git a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt index d9fdaaf8..edcfef62 100644 --- a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt @@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter1 PROPERTIES RUNTIME_OUTPUT_D # Interface Framework Generator: qt6_ifcodegen(QtIfInstrumentCluster_Chapter1 - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE frontend ) target_include_directories(QtIfInstrumentCluster_Chapter1 PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro index e91ba397..5fada5ac 100644 --- a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro +++ b/examples/interfaceframework/qface-tutorial/chapter1-basics/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/chapter1-basics diff --git a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt index 87dca903..d0e48168 100644 --- a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt @@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter2 PROPERTIES RUNTIME_OUTPUT_D # Interface Framework Generator: qt6_ifcodegen(QtIfInstrumentCluster_Chapter2 - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE frontend ) target_include_directories(QtIfInstrumentCluster_Chapter2 PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro index 7cd601cc..0986c7a8 100644 --- a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro +++ b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/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/chapter2-enums-structs diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt index 265ad19b..b0f0a7c5 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(ic_chapter3_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY # Interface Framework Generator: qt6_ifcodegen(ic_chapter3_simulation - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT backend_simulator + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE backend_simulator ) target_link_libraries(ic_chapter3_simulation PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro index 692e7e8e..21f2bbc2 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/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 # Additional import path used to resolve QML modules in Qt Creator's code model diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt index a4df681a..367a1306 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt @@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter3 PROPERTIES RUNTIME_OUTPUT_D # Interface Framework Generator: qt6_ifcodegen(QtIfInstrumentCluster_Chapter3 - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE frontend ) target_include_directories(QtIfInstrumentCluster_Chapter3 PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro index a524dab4..9507ffe5 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/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/chapter3-simulation-backend diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt index 2e855640..e7c7cb60 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt @@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework) # Interface Framework Generator: qt6_ifcodegen(instrument_cluster_chapter3_imports # special case - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT qmlplugin + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE qmlplugin ) target_link_libraries(instrument_cluster_chapter3_imports PUBLIC # special case diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro index fb5a9ac6..4655c990 100644 --- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro +++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/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) 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) diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt index 3ccba71b..2cc66844 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(ic_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../interfacefr # Interface Framework Generator: qt6_ifcodegen(ic_qtro - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT backend_qtro + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE backend_qtro ) target_link_libraries(ic_qtro PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro index 55db7279..9c701631 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.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_qtro -QFACE_SOURCES = ../instrument-cluster.qface +IFCODEGEN_TEMPLATE = backend_qtro +IFCODEGEN_SOURCES = ../instrument-cluster.qface PLUGIN_TYPE = interfaceframework CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt index 0c4d6555..fbe94947 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(ic_chapter5_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY # Interface Framework Generator: qt6_ifcodegen(ic_chapter5_simulation - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT backend_simulator + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE backend_simulator ) target_link_libraries(ic_chapter5_simulation PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro index 27b8c0ad..4616ec39 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/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/chapter5-ipc/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt index fa7071f2..24841a30 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt @@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter5 PROPERTIES RUNTIME_OUTPUT_D # Interface Framework Generator: qt6_ifcodegen(QtIfInstrumentCluster_Chapter5 - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE frontend ) target_include_directories(QtIfInstrumentCluster_Chapter5 PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro index 8dcf5351..56b9ce2f 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/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/chapter5-ipc diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt index 5af39a38..a41e7f54 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt @@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework) # Interface Framework Generator: qt6_ifcodegen(instrument_cluster_chapter5_imports - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT qmlplugin + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE qmlplugin ) target_link_libraries(instrument_cluster_chapter5_imports PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro index 59cd475e..619cfdb7 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/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) diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt index 7796dd37..b9c10ff6 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt @@ -19,8 +19,8 @@ set_target_properties(chapter5-ipc-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY .. # Interface Framework Generator: qt6_ifcodegen(chapter5-ipc-server - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT server_qtro_simulator + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE server_qtro_simulator ) set_target_properties(chapter5-ipc-server PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro index a92bceb6..14315d0c 100644 --- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro +++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro @@ -9,8 +9,8 @@ CONFIG += ifcodegen LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster) INCLUDEPATH += $$OUT_PWD/../frontend -QFACE_FORMAT = server_qtro_simulator -QFACE_SOURCES = ../instrument-cluster.qface +IFCODEGEN_TEMPLATE = server_qtro_simulator +IFCODEGEN_SOURCES = ../instrument-cluster.qface QML_IMPORT_PATH = $$OUT_PWD/qml diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt index a72a9f41..e642cdfe 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt @@ -20,8 +20,8 @@ set_target_properties(ic_chapter6_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY # Interface Framework Generator: qt6_ifcodegen(ic_chapter6_simulation - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT backend_simulator + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE backend_simulator ) target_link_libraries(ic_chapter6_simulation PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro index 1bf50e0a..8094a4ce 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/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/chapter6-own-backend/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt index 9dbdcc35..0e3929da 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt @@ -26,8 +26,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter6 PROPERTIES RUNTIME_OUTPUT_D # Interface Framework Generator: qt6_ifcodegen(QtIfInstrumentCluster_Chapter6 - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT frontend + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE frontend ) target_include_directories(QtIfInstrumentCluster_Chapter6 PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro index 5df4f9cd..5a5b94c7 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/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/chapter6-own-backend diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt index 2b4bbe9f..a3c3db32 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt @@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework) # Interface Framework Generator: qt6_ifcodegen(instrument_cluster_chapter6_imports - QFACE_SOURCES ../instrument-cluster.qface - QFACE_FORMAT qmlplugin + IFCODEGEN_SOURCES ../instrument-cluster.qface + IFCODEGEN_TEMPLATE qmlplugin ) target_link_libraries(instrument_cluster_chapter6_imports PUBLIC diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro index 6314a3a2..8404889a 100644 --- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro +++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/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) |