diff options
| author | Zoltan Gera <zoltan.gera@qt.io> | 2025-11-25 17:36:32 +0200 |
|---|---|---|
| committer | Zoltan Gera <zoltan.gera@qt.io> | 2025-12-08 14:32:34 +0200 |
| commit | c38de278bfeaa00d212e37519b9ee2b9ef585cb2 (patch) | |
| tree | 03ba0cb9bf3a303e9886e2ce428bce16577ab887 | |
| parent | 5c8695b0d75b7c69194d1d8fbbeaa3af43ac79ed (diff) | |
Fix references to Jinja sources
Include and import references to Jinja sources and build system
references to template files are fixed to use the changed extensions.
Task-number: QTBUG-140720
Pick-to: 6.11
Change-Id: I427264a45fc3eca5aaea92e7a2cac19cce44b5b7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
66 files changed, 203 insertions, 203 deletions
diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja index 896f30b5..3fcf7f46 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja index 54f6206c..7f5c69c2 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}DBusBackend'.format(interface) %} #include "{{class|lower}}.h" diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja index d760327d..804a4da7 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}DBusBackend'.format(interface) %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} #ifndef {{oncedefine}} diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja index 6478430f..95f73d87 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}DBusPlugin'.format(module.module_name) %} #include "{{class|lower}}.h" diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja index 27f4e75b..43105048 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}DBusPlugin'.format(module.module_name) %} {% set oncedefine = '{0}_H_'.format(class|upper) %} diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.jinja b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.jinja index 1d4b5307..9b2f34f4 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.jinja +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} HEADERS += \ {% for interface in module.interfaces %} diff --git a/examples/interfaceframework/qface-tutorial/doc/src/qface-tutorial.qdoc b/examples/interfaceframework/qface-tutorial/doc/src/qface-tutorial.qdoc index c60ca5c1..fc2addd7 100644 --- a/examples/interfaceframework/qface-tutorial/doc/src/qface-tutorial.qdoc +++ b/examples/interfaceframework/qface-tutorial/doc/src/qface-tutorial.qdoc @@ -958,16 +958,16 @@ name as well. The next step is to rename the files in our template folder, to make them more generic and - identify them as templates by adding an additional \c tpl suffix. + identify them as templates by adding an additional \c jinja suffix. The template folder should now look like this: \list - \li backend.cpp.tpl - \li backend.h.tpl - \li plugin.cpp.tpl - \li plugin.h.tpl - \li plugin.json.tpl + \li backend.cpp.jinja + \li backend.h.jinja + \li plugin.cpp.jinja + \li plugin.h.jinja + \li plugin.json.jinja \endlist \section2 Convert all files to templates @@ -975,15 +975,15 @@ Let's go over all the files in the template and use the special \l {Jinja Template Syntax} to extend them for our needs. - \section3 plugin.h.tpl + \section3 plugin.h.jinja The first thing we usually want to do is to add a special comment for the autogenerated file. This will mark it as autogenerated and that it shouldn't be edited manually. The following line includes a predefined comment file (part of ifcodegen): - \e ch7-own-template/templates/backend_dbus/plugin.h.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.tpl + \e ch7-own-template/templates/backend_dbus/plugin.h.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja \skipto {% include \printuntil {% include @@ -1009,8 +1009,8 @@ be used. All text that does not use the Jinja syntax is printed as is. With that in mind we can keep the include statements as they are and the template file should look like this: - \e ch7-own-template/templates/backend_dbus/plugin.h.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.tpl + \e ch7-own-template/templates/backend_dbus/plugin.h.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja \skipto #ifndef \printuntil #define \dots @@ -1022,8 +1022,8 @@ The class declaration will now look like this: - \e ch7-own-template/templates/backend_dbus/plugin.h.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.tpl + \e ch7-own-template/templates/backend_dbus/plugin.h.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.h.jinja \skipto class {{class}} \printuntil }; @@ -1032,16 +1032,16 @@ interfaces and the plugin needs to store instances for all of them. This can be easily achieved by using a vector instead of hardcoded values. - \section3 plugin.cpp.tpl + \section3 plugin.cpp.jinja - In a similar fashion the \c plugin.cpp.tpl can be extended with \l {Jinja Template Syntax} + In a similar fashion the \c plugin.cpp.jinja can be extended with \l {Jinja Template Syntax} {Jinja syntax}. It also starts by including the generated comment and by defining the \c class variable. In addition to including the autogenerated plugin header, we also need to include the header for all backend classes. As mentioned before, a module can have multiple interfaces. To generate an include statement for every interface within a module, a Jinja for loop is used: - \e ch7-own-template/templates/backend_dbus/plugin.cpp.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.tpl + \e ch7-own-template/templates/backend_dbus/plugin.cpp.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja \skipto {% for \printuntil {% endfor @@ -1056,18 +1056,18 @@ The full plugin definition now looks like this: - \e ch7-own-template/templates/backend_dbus/plugin.cpp.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.tpl + \e ch7-own-template/templates/backend_dbus/plugin.cpp.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.cpp.jinja \skipto {{class}} \printuntil - \section3 backend.h.tpl and backend.cpp.tpl + \section3 backend.h.jinja and backend.cpp.jinja The backend class files follow the same schema as the plugin. All fetch methods are generated using a loop like this: - \e ch7-own-template/templates/backend_dbus/backend.h.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.tpl + \e ch7-own-template/templates/backend_dbus/backend.h.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja \skipto {% for \printuntil {% endfor @@ -1075,8 +1075,8 @@ as an argument we need to generate this part as well. This is done by using a filter called \l parameter_type, which takes care of that. - \e ch7-own-template/templates/backend_dbus/backend.h.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.tpl + \e ch7-own-template/templates/backend_dbus/backend.h.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.h.jinja \skipuntil public Q_SLOTS: \printuntil {% endfor @@ -1087,15 +1087,15 @@ replace the hardcoded \c propertyChanged method calls in the \c initialize() function with a Jinja for loop. - \e ch7-own-template/templates/backend_dbus/backend.cpp.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.tpl + \e ch7-own-template/templates/backend_dbus/backend.cpp.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja \skipto {{class}} \printto void {{class}}::setupConnection() The rest of the code is ported accordingly and looks like this: - \e ch7-own-template/templates/backend_dbus/backend.cpp.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.tpl + \e ch7-own-template/templates/backend_dbus/backend.cpp.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja \skipto void {{class}}::setupConnection() \printto @@ -1104,8 +1104,8 @@ For the plugin to be loaded correctly we also need to generate the \c plugin.json file, which is done like this: - \e ch7-own-template/templates/backend_dbus/plugin.json.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.json.tpl + \e ch7-own-template/templates/backend_dbus/plugin.json.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.json.jinja \skipuntil #} \printto @@ -1129,8 +1129,8 @@ Now as the information is part of the IDL file, we can also access it in the template like this: - \e ch7-own-template/templates/backend_dbus/backend.cpp.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.tpl + \e ch7-own-template/templates/backend_dbus/backend.cpp.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/backend.cpp.jinja \skipto m_client = \printuntil m_client = @@ -1143,10 +1143,10 @@ Right now ifcodegen supports both QMake and CMake as build systems. For each one we need to provide additional files to let the build system know how to generate and compile our code. - For QMake we add a \c plugin.pri.tpl: + For QMake we add a \c plugin.pri.jinja: - \e ch7-own-template/templates/backend_dbus/plugin.pri.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.tpl + \e ch7-own-template/templates/backend_dbus/plugin.pri.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/plugin.pri.jinja \skipuntil #} \printto @@ -1157,8 +1157,8 @@ You might wonder, why the actual file names differ from the template names? We will explain that after we had a look at the CMake integration: - \e ch7-own-template/templates/backend_dbus/CMakeLists.txt.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.tpl + \e ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja \skipuntil #} \printto @@ -1172,8 +1172,8 @@ \c ${CURRENT_TARGET} variable is set and the previous defined variables are used to call the needed cmake functions, e.g: - \e ch7-own-template/templates/backend_dbus/CMakeLists.txt.tpl: - \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.tpl + \e ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja: + \quotefromfile interfaceframework/qface-tutorial/ch7-own-template/templates/backend_dbus/CMakeLists.txt.jinja \skipto target_sources \printuntil ) diff --git a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc index 6bf93e63..e4e43c4a 100644 --- a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc +++ b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc @@ -156,10 +156,10 @@ frontend: module: documents: - - "{{module.module_name|lower}}plugin.h": "plugin.h.tpl" + - "{{module.module_name|lower}}plugin.h": "plugin.h.jinja" interface: documents: - - '{{interface|lower}}backend.h': 'backend.h.tpl' + - '{{interface|lower}}backend.h': 'backend.h.jinja' \endcode For every entity, there's a list of templates that must be called, when traversing this entity @@ -193,7 +193,7 @@ extra_filters: [ "extra-filter/filters.py" ] module: documents: - - "{{module.module_name|lower}}plugin.h": "plugin.h.tpl" + - "{{module.module_name|lower}}plugin.h": "plugin.h.jinja" \endcode \section2 Annotations YAML diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt index 24d2fc7f..e3c1ef94 100644 --- a/src/tools/ifcodegen/CMakeLists.txt +++ b/src/tools/ifcodegen/CMakeLists.txt @@ -228,75 +228,75 @@ add_custom_target(generator SOURCES qt_copy_or_install( FILES - templates/common/generated_comment.cpp.tpl - templates/common/generated_comment.cmake.tpl - templates/common/generated_comment.qmake.tpl - templates/common/generated_comment.qml.tpl - templates/common/generated_comment.rep.tpl - templates/common/qtif_macros.j2 - templates/common/simulation.qmltypes.tpl - templates/common/plugins.qmltypes.tpl - templates/common/designer.metainfo.tpl - templates/common/qmldir.tpl - templates/common/interface.rep.tpl - templates/common/simulation_data.json.tpl - templates/common/simulation.qrc.tpl - templates/common/module_simulation.qml.tpl - templates/common/backend_simulation.cpp.tpl - templates/common/backend_simulation.h.tpl - templates/common/backend_simulation.qml.tpl - templates/common/pagingmodel_simulation.h.tpl - templates/common/pagingmodel_simulation.cpp.tpl + templates/common/generated_comment.cpp.jinja + templates/common/generated_comment.cmake.jinja + templates/common/generated_comment.qmake.jinja + templates/common/generated_comment.qml.jinja + templates/common/generated_comment.rep.jinja + templates/common/qtif_macros.jinja + templates/common/simulation.qmltypes.jinja + templates/common/plugins.qmltypes.jinja + templates/common/designer.metainfo.jinja + templates/common/qmldir.jinja + templates/common/interface.rep.jinja + templates/common/simulation_data.json.jinja + templates/common/simulation.qrc.jinja + templates/common/module_simulation.qml.jinja + templates/common/backend_simulation.cpp.jinja + templates/common/backend_simulation.h.jinja + templates/common/backend_simulation.qml.jinja + templates/common/pagingmodel_simulation.h.jinja + templates/common/pagingmodel_simulation.cpp.jinja DESTINATION "${templates_install_dir}/common" ) qt_copy_or_install( FILES - templates/frontend/backendinterface.cpp.tpl - templates/frontend/backendinterface.h.tpl - templates/frontend/global.h.tpl - templates/frontend/interface.cpp.tpl - templates/frontend/interface.h.tpl - templates/frontend/interface_p.h.tpl - templates/frontend/module.cpp.tpl - templates/frontend/module.h.tpl - templates/frontend/module_qml_enum.qdocinc.tpl - templates/frontend/module.pri.tpl - templates/frontend/modulefactory.cpp.tpl - templates/frontend/modulefactory.h.tpl - templates/frontend/struct.cpp.tpl - templates/frontend/struct.h.tpl - templates/frontend/CMakeLists.txt.tpl + templates/frontend/backendinterface.cpp.jinja + templates/frontend/backendinterface.h.jinja + templates/frontend/global.h.jinja + templates/frontend/interface.cpp.jinja + templates/frontend/interface.h.jinja + templates/frontend/interface_p.h.jinja + templates/frontend/module.cpp.jinja + templates/frontend/module.h.jinja + templates/frontend/module_qml_enum.qdocinc.jinja + templates/frontend/module.pri.jinja + templates/frontend/modulefactory.cpp.jinja + templates/frontend/modulefactory.h.jinja + templates/frontend/struct.cpp.jinja + templates/frontend/struct.h.jinja + templates/frontend/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/frontend" ) qt_copy_or_install( FILES - templates/qmlplugin/module.pri.tpl - templates/qmlplugin/plugin.cpp.tpl - templates/qmlplugin/qmldir_plugin.tpl - templates/qmlplugin/CMakeLists.txt.tpl + templates/qmlplugin/module.pri.jinja + templates/qmlplugin/plugin.cpp.jinja + templates/qmlplugin/qmldir_plugin.jinja + templates/qmlplugin/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/qmlplugin" ) qt_copy_or_install( FILES - templates/backend_simulator/plugin.cpp.tpl - templates/backend_simulator/plugin.h.tpl - templates/backend_simulator/plugin.json - templates/backend_simulator/plugin.pri.tpl - templates/backend_simulator/CMakeLists.txt.tpl + templates/backend_simulator/plugin.cpp.jinja + templates/backend_simulator/plugin.h.jinja + templates/backend_simulator/plugin.json.jinja + templates/backend_simulator/plugin.pri.jinja + templates/backend_simulator/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/backend_simulator" ) qt_copy_or_install( FILES - templates/test/tst_test.h.tpl - templates/test/tst_test.cpp.tpl - templates/test/module.pri.tpl - templates/test/main.cpp.tpl - templates/test/pagingmodel.h.tpl - templates/test/CMakeLists.txt.tpl + templates/test/tst_test.h.jinja + templates/test/tst_test.cpp.jinja + templates/test/module.pri.jinja + templates/test/main.cpp.jinja + templates/test/pagingmodel.h.jinja + templates/test/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/test" ) @@ -314,7 +314,7 @@ if ("${QT_HOST_PATH}" STREQUAL "" OR (CMAKE_CROSSCOMPILING AND QT_FORCE_BUILD_TO AND NOT QT_FEATURE_compiled_ifcodegen) qt_copy_or_install( FILES - templates/backend_qtro/backend.cpp.tpl + templates/backend_qtro/backend.cpp.jinja generator/global_functions.py generator/builtin_config.py generator/filters.py @@ -340,37 +340,37 @@ endif() if (QT_FEATURE_remoteobjects) qt_copy_or_install( FILES - templates/backend_qtro/backend.cpp.tpl - templates/backend_qtro/backend.h.tpl - templates/backend_qtro/pagingmodel.h.tpl - templates/backend_qtro/pagingmodel.cpp.tpl - templates/backend_qtro/plugin.cpp.tpl - templates/backend_qtro/plugin.h.tpl - templates/backend_qtro/plugin.json - templates/backend_qtro/plugin.pri.tpl - templates/backend_qtro/CMakeLists.txt.tpl + templates/backend_qtro/backend.cpp.jinja + templates/backend_qtro/backend.h.jinja + templates/backend_qtro/pagingmodel.h.jinja + templates/backend_qtro/pagingmodel.cpp.jinja + templates/backend_qtro/plugin.cpp.jinja + templates/backend_qtro/plugin.h.jinja + templates/backend_qtro/plugin.json.jinja + templates/backend_qtro/plugin.pri.jinja + templates/backend_qtro/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/backend_qtro" ) qt_copy_or_install( FILES - templates/server_qtro/core.cpp.tpl - templates/server_qtro/core.h.tpl - templates/server_qtro/main.cpp.tpl - templates/server_qtro/server.pri.tpl - templates/server_qtro/CMakeLists.txt.tpl + templates/server_qtro/core.cpp.jinja + templates/server_qtro/core.h.jinja + templates/server_qtro/main.cpp.jinja + templates/server_qtro/server.pri.jinja + templates/server_qtro/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/server_qtro" ) qt_copy_or_install( FILES - templates/server_qtro_simulator/core.cpp.tpl - templates/server_qtro_simulator/core.h.tpl - templates/server_qtro_simulator/adapter.cpp.tpl - templates/server_qtro_simulator/adapter.h.tpl - templates/server_qtro_simulator/main.cpp.tpl - templates/server_qtro_simulator/server.pri.tpl - templates/server_qtro_simulator/CMakeLists.txt.tpl + templates/server_qtro_simulator/core.cpp.jinja + templates/server_qtro_simulator/core.h.jinja + templates/server_qtro_simulator/adapter.cpp.jinja + templates/server_qtro_simulator/adapter.h.jinja + templates/server_qtro_simulator/main.cpp.jinja + templates/server_qtro_simulator/server.pri.jinja + templates/server_qtro_simulator/CMakeLists.txt.jinja DESTINATION "${templates_install_dir}/server_qtro_simulator" ) diff --git a/src/tools/ifcodegen/generate.py b/src/tools/ifcodegen/generate.py index 1be8cd94..2bdc1e33 100755 --- a/src/tools/ifcodegen/generate.py +++ b/src/tools/ifcodegen/generate.py @@ -234,20 +234,20 @@ def self_check(ctx, param, value): test: module: documents: - - "{{srcBase|lower}}": "module.tpl" + - "{{srcBase|lower}}": "module.jinja" interface: documents: - - 'tst_{{interface|lower}}': 'interface.tpl' + - 'tst_{{interface|lower}}': 'interface.jinja' """) os.mkdir(tmp / "selfcheck") - with open(tmp / "selfcheck/module.tpl", 'w') as file: + with open(tmp / "selfcheck/module.jinja", 'w') as file: # Write content to the file file.write(""" {{module.name}} """) - with open(tmp / "selfcheck/interface.tpl", 'w') as file: + with open(tmp / "selfcheck/interface.jinja", 'w') as file: # Write content to the file file.write(""" {{interface.name}} diff --git a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.jinja index bb3dcd6d..8fddc2de 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} set(QT_NO_PRIVATE_MODULE_WARNING ON) diff --git a/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.jinja b/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.jinja index f7cce9bb..0636e839 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.jinja @@ -4,8 +4,8 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}RoBackend'.format(interface) %} {% set zone_class = '{0}RoZone'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} @@ -25,7 +25,7 @@ Q_LOGGING_CATEGORY(qLcRO{{interface}}, "{{module|qml_type|lower}}.{{interface|lo {% for property in interface.properties %} {% if property.type.is_model %} -{% include "pagingmodel.cpp.tpl" %} +{% include "pagingmodel.cpp.jinja" %} {% endif %} {% endfor %} diff --git a/src/tools/ifcodegen/templates/backend_qtro/backend.h.jinja b/src/tools/ifcodegen/templates/backend_qtro/backend.h.jinja index 7a64d180..4a59bdd4 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/backend.h.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/backend.h.jinja @@ -4,8 +4,8 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}RoBackend'.format(interface) %} {% set zone_class = '{0}RoZone'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} @@ -24,7 +24,7 @@ {% for property in interface.properties %} {% if property.type.is_model %} -{% include "pagingmodel.h.tpl" %} +{% include "pagingmodel.h.jinja" %} {% endif %} {% endfor %} diff --git a/src/tools/ifcodegen/templates/backend_qtro/plugin.cpp.jinja b/src/tools/ifcodegen/templates/backend_qtro/plugin.cpp.jinja index d144c8f4..8145c3ef 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/plugin.cpp.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/plugin.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}RoPlugin'.format(module.module_name|upperfirst) %} #include "{{class|lower}}.h" diff --git a/src/tools/ifcodegen/templates/backend_qtro/plugin.h.jinja b/src/tools/ifcodegen/templates/backend_qtro/plugin.h.jinja index d676d394..e51b29bc 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/plugin.h.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/plugin.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}RoPlugin'.format(module.module_name|upperfirst) %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} diff --git a/src/tools/ifcodegen/templates/backend_qtro/plugin.pri.jinja b/src/tools/ifcodegen/templates/backend_qtro/plugin.pri.jinja index a0bb8525..9df8856e 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/plugin.pri.jinja +++ b/src/tools/ifcodegen/templates/backend_qtro/plugin.pri.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} QT += remoteobjects ifremoteobjects_helper_private diff --git a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.jinja index ef216468..e2ebcc83 100644 --- a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} diff --git a/src/tools/ifcodegen/templates/backend_simulator/plugin.cpp.jinja b/src/tools/ifcodegen/templates/backend_simulator/plugin.cpp.jinja index 145db3ee..311938c5 100644 --- a/src/tools/ifcodegen/templates/backend_simulator/plugin.cpp.jinja +++ b/src/tools/ifcodegen/templates/backend_simulator/plugin.cpp.jinja @@ -5,7 +5,7 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}SimulatorPlugin'.format(module.module_name|upperfirst) %} #include "{{class|lower}}.h" diff --git a/src/tools/ifcodegen/templates/backend_simulator/plugin.h.jinja b/src/tools/ifcodegen/templates/backend_simulator/plugin.h.jinja index a9ff220c..5142ae9d 100644 --- a/src/tools/ifcodegen/templates/backend_simulator/plugin.h.jinja +++ b/src/tools/ifcodegen/templates/backend_simulator/plugin.h.jinja @@ -5,7 +5,7 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}SimulatorPlugin'.format(module.module_name|upperfirst) %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} diff --git a/src/tools/ifcodegen/templates/backend_simulator/plugin.pri.jinja b/src/tools/ifcodegen/templates/backend_simulator/plugin.pri.jinja index a654b8a6..33687c80 100644 --- a/src/tools/ifcodegen/templates/backend_simulator/plugin.pri.jinja +++ b/src/tools/ifcodegen/templates/backend_simulator/plugin.pri.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} HEADERS += \ {% for interface in module.interfaces %} diff --git a/src/tools/ifcodegen/templates/common/backend_simulation.cpp.jinja b/src/tools/ifcodegen/templates/common/backend_simulation.cpp.jinja index f0469322..55b62c5a 100644 --- a/src/tools/ifcodegen/templates/common/backend_simulation.cpp.jinja +++ b/src/tools/ifcodegen/templates/common/backend_simulation.cpp.jinja @@ -5,8 +5,8 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}Backend'.format(interface) %} {% set zone_class = '{0}Zone'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} @@ -17,7 +17,7 @@ {% for property in interface.properties %} {% if property.type.is_model %} -{% include "common/pagingmodel_simulation.cpp.tpl" %} +{% include "common/pagingmodel_simulation.cpp.jinja" %} {% endif %} {% endfor %} diff --git a/src/tools/ifcodegen/templates/common/backend_simulation.h.jinja b/src/tools/ifcodegen/templates/common/backend_simulation.h.jinja index 793ff819..fee8aada 100644 --- a/src/tools/ifcodegen/templates/common/backend_simulation.h.jinja +++ b/src/tools/ifcodegen/templates/common/backend_simulation.h.jinja @@ -5,8 +5,8 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}Backend'.format(interface) %} {% set zone_class = '{0}Zone'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} @@ -26,7 +26,7 @@ QT_FORWARD_DECLARE_CLASS(QIfSimulationEngine) {% for property in interface.properties %} {% if property.type.is_model %} -{% include "common/pagingmodel_simulation.h.tpl" %} +{% include "common/pagingmodel_simulation.h.jinja" %} {% endif %} {% endfor %} diff --git a/src/tools/ifcodegen/templates/common/backend_simulation.qml.jinja b/src/tools/ifcodegen/templates/common/backend_simulation.qml.jinja index 0ce5de10..45c68f2c 100644 --- a/src/tools/ifcodegen/templates/common/backend_simulation.qml.jinja +++ b/src/tools/ifcodegen/templates/common/backend_simulation.qml.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qml.tpl" %} +{% include "common/generated_comment.qml.jinja" %} import QtQuick import {{module|qml_type}}.simulation diff --git a/src/tools/ifcodegen/templates/common/designer.metainfo.jinja b/src/tools/ifcodegen/templates/common/designer.metainfo.jinja index 52a5b061..4e642376 100644 --- a/src/tools/ifcodegen/templates/common/designer.metainfo.jinja +++ b/src/tools/ifcodegen/templates/common/designer.metainfo.jinja @@ -2,8 +2,8 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.qml.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.qml.jinja" %} {% set module_qml_name = (module|qml_type).split('.')[-1]|upperfirst %} {% set default_category_name = module_qml_name %} {% if module.tags.designer and module.tags.designer.categoryName %} diff --git a/src/tools/ifcodegen/templates/common/interface.rep.jinja b/src/tools/ifcodegen/templates/common/interface.rep.jinja index 784ca6e3..376a78ac 100644 --- a/src/tools/ifcodegen/templates/common/interface.rep.jinja +++ b/src/tools/ifcodegen/templates/common/interface.rep.jinja @@ -4,8 +4,8 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.rep.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.rep.jinja" %} {% set class = '{0}'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} {% if interface.module.tags.config.module %} diff --git a/src/tools/ifcodegen/templates/common/module_simulation.qml.jinja b/src/tools/ifcodegen/templates/common/module_simulation.qml.jinja index 31629113..14ce607a 100644 --- a/src/tools/ifcodegen/templates/common/module_simulation.qml.jinja +++ b/src/tools/ifcodegen/templates/common/module_simulation.qml.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qml.tpl" %} +{% include "common/generated_comment.qml.jinja" %} import QtQuick import {{module|qml_type}}.simulation diff --git a/src/tools/ifcodegen/templates/common/plugins.qmltypes.jinja b/src/tools/ifcodegen/templates/common/plugins.qmltypes.jinja index b0d44d04..ce9674e3 100644 --- a/src/tools/ifcodegen/templates/common/plugins.qmltypes.jinja +++ b/src/tools/ifcodegen/templates/common/plugins.qmltypes.jinja @@ -3,8 +3,8 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.qml.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.qml.jinja" %} {% set module_qml_name = (module|qml_type).split('.')[-1]|upperfirst %} import QtQuick.tooling 1.2 diff --git a/src/tools/ifcodegen/templates/common/simulation.qmltypes.jinja b/src/tools/ifcodegen/templates/common/simulation.qmltypes.jinja index a6159130..e441f1fc 100644 --- a/src/tools/ifcodegen/templates/common/simulation.qmltypes.jinja +++ b/src/tools/ifcodegen/templates/common/simulation.qmltypes.jinja @@ -3,8 +3,8 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.qml.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.qml.jinja" %} {% set module_qml_name = (module|qml_type).split('.')[-1]|upperfirst %} import QtQuick.tooling 1.2 diff --git a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.jinja index a57e0ce3..42c5adb2 100644 --- a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} set(QT_NO_PRIVATE_MODULE_WARNING ON) diff --git a/src/tools/ifcodegen/templates/frontend/backendinterface.cpp.jinja b/src/tools/ifcodegen/templates/frontend/backendinterface.cpp.jinja index 122769d2..4387c36b 100644 --- a/src/tools/ifcodegen/templates/frontend/backendinterface.cpp.jinja +++ b/src/tools/ifcodegen/templates/frontend/backendinterface.cpp.jinja @@ -3,9 +3,9 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}BackendInterface'.format(interface) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #include "{{class|lower}}.h" diff --git a/src/tools/ifcodegen/templates/frontend/backendinterface.h.jinja b/src/tools/ifcodegen/templates/frontend/backendinterface.h.jinja index c1612eef..24d9094f 100644 --- a/src/tools/ifcodegen/templates/frontend/backendinterface.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/backendinterface.h.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}BackendInterface'.format(interface) %} {% if interface.tags.config.zoned %} {% set base_class = 'QIfZonedFeatureInterface' %} @@ -12,7 +12,7 @@ {% endif %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/global.h.jinja b/src/tools/ifcodegen/templates/frontend/global.h.jinja index 43039f57..9fe4ddde 100644 --- a/src/tools/ifcodegen/templates/frontend/global.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/global.h.jinja @@ -5,7 +5,7 @@ #} {% set exportsymbol = '{0}'.format(module|upper|replace('.', '_')) %} {% set oncedefine = '{0}GLOBAL_H_'.format(exportsymbol) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/interface.cpp.jinja b/src/tools/ifcodegen/templates/frontend/interface.cpp.jinja index f594fb6b..f30e04d7 100644 --- a/src/tools/ifcodegen/templates/frontend/interface.cpp.jinja +++ b/src/tools/ifcodegen/templates/frontend/interface.cpp.jinja @@ -4,9 +4,9 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}'.format(interface) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #include "{{class|lower}}.h" #include "{{class|lower}}_p.h" diff --git a/src/tools/ifcodegen/templates/frontend/interface.h.jinja b/src/tools/ifcodegen/templates/frontend/interface.h.jinja index 7f7bbedf..79cd0435 100644 --- a/src/tools/ifcodegen/templates/frontend/interface.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/interface.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}'.format(interface) %} {% if interface.tags.config.zoned %} {% set base_class = 'QIfAbstractZonedFeature' %} @@ -13,7 +13,7 @@ {% endif %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/interface_p.h.jinja b/src/tools/ifcodegen/templates/frontend/interface_p.h.jinja index 0bd0949d..c5c353ee 100644 --- a/src/tools/ifcodegen/templates/frontend/interface_p.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/interface_p.h.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}'.format(interface) %} {% if interface.tags.config.zoned %} {% set base_class = 'QIfAbstractZonedFeature' %} @@ -11,7 +11,7 @@ {% set base_class = 'QIfAbstractFeature' %} {% endif %} {% set oncedefine = '{0}_{1}PRIVATE_H_'.format(module.module_name|upper, class|upper) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/module.cpp.jinja b/src/tools/ifcodegen/templates/frontend/module.cpp.jinja index afa36a43..ee1e312b 100644 --- a/src/tools/ifcodegen/templates/frontend/module.cpp.jinja +++ b/src/tools/ifcodegen/templates/frontend/module.cpp.jinja @@ -6,8 +6,8 @@ #} {% set class = '{0}'.format(module.module_name|upperfirst) %} {% set qml_name = (module|qml_type).split('.')[-1]|upperfirst %} -{% include 'common/generated_comment.cpp.tpl' %} -{% import 'common/qtif_macros.j2' as qtif %} +{% include 'common/generated_comment.cpp.jinja' %} +{% import 'common/qtif_macros.jinja' as qtif %} #include "{{class|lower}}.h" #include "{{class|lower}}factory.h" diff --git a/src/tools/ifcodegen/templates/frontend/module.h.jinja b/src/tools/ifcodegen/templates/frontend/module.h.jinja index 449d7ba6..ea43b5e7 100644 --- a/src/tools/ifcodegen/templates/frontend/module.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/module.h.jinja @@ -7,7 +7,7 @@ {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %} {% set class = '{0}'.format(module.module_name|upperfirst) %} {% set oncedefine = '{0}_H_'.format(class|upper) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/module.pri.jinja b/src/tools/ifcodegen/templates/frontend/module.pri.jinja index 4f615272..437e4df4 100644 --- a/src/tools/ifcodegen/templates/frontend/module.pri.jinja +++ b/src/tools/ifcodegen/templates/frontend/module.pri.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} # Export all symbols when building this library DEFINES *= QT_BUILD_{{module|upper|replace('.', '_')|strip_QT}}_LIB diff --git a/src/tools/ifcodegen/templates/frontend/modulefactory.cpp.jinja b/src/tools/ifcodegen/templates/frontend/modulefactory.cpp.jinja index e964f01d..761ffaad 100644 --- a/src/tools/ifcodegen/templates/frontend/modulefactory.cpp.jinja +++ b/src/tools/ifcodegen/templates/frontend/modulefactory.cpp.jinja @@ -6,7 +6,7 @@ #} {% set class = '{0}Factory'.format(module.module_name|upperfirst) %} {% set qml_name = (module|qml_type).split('.')[-1]|upperfirst %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #include "{{class|lower}}.h" diff --git a/src/tools/ifcodegen/templates/frontend/modulefactory.h.jinja b/src/tools/ifcodegen/templates/frontend/modulefactory.h.jinja index 2b795a90..e95475e4 100644 --- a/src/tools/ifcodegen/templates/frontend/modulefactory.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/modulefactory.h.jinja @@ -8,7 +8,7 @@ {% set class = '{0}Factory'.format(module.module_name|upperfirst) %} {% set qml_name = (module|qml_type).split('.')[-1]|upperfirst %} {% set oncedefine = '{0}_H_'.format(class|upper) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/frontend/struct.cpp.jinja b/src/tools/ifcodegen/templates/frontend/struct.cpp.jinja index 2a751b1a..d963082b 100644 --- a/src/tools/ifcodegen/templates/frontend/struct.cpp.jinja +++ b/src/tools/ifcodegen/templates/frontend/struct.cpp.jinja @@ -5,9 +5,9 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}'.format(struct) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #include "{{class|lower}}.h" diff --git a/src/tools/ifcodegen/templates/frontend/struct.h.jinja b/src/tools/ifcodegen/templates/frontend/struct.h.jinja index 09f5c39f..e7b7b37d 100644 --- a/src/tools/ifcodegen/templates/frontend/struct.h.jinja +++ b/src/tools/ifcodegen/templates/frontend/struct.h.jinja @@ -5,11 +5,11 @@ # Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} +{% import 'common/qtif_macros.jinja' as qtif %} {% set class = '{0}'.format(struct) %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} {% set exportsymbol = 'Q_{0}_EXPORT'.format(module|upper|replace('.', '_')) %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/qmlplugin/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/qmlplugin/CMakeLists.txt.jinja index 9ccc3961..8eb1b329 100644 --- a/src/tools/ifcodegen/templates/qmlplugin/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/qmlplugin/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} message(WARNING "The qmlplugin template should only be used for porting from qmake to CMake. Please use one of the alternatives mentioned here: diff --git a/src/tools/ifcodegen/templates/qmlplugin/module.pri.jinja b/src/tools/ifcodegen/templates/qmlplugin/module.pri.jinja index c2b06e29..933c0777 100644 --- a/src/tools/ifcodegen/templates/qmlplugin/module.pri.jinja +++ b/src/tools/ifcodegen/templates/qmlplugin/module.pri.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} TARGET = {{module.module_name|lower}}plugin URI = {{module|qml_type}} diff --git a/src/tools/ifcodegen/templates/qmlplugin/plugin.cpp.jinja b/src/tools/ifcodegen/templates/qmlplugin/plugin.cpp.jinja index 36815951..fcef338f 100644 --- a/src/tools/ifcodegen/templates/qmlplugin/plugin.cpp.jinja +++ b/src/tools/ifcodegen/templates/qmlplugin/plugin.cpp.jinja @@ -6,7 +6,7 @@ {% set exportsymbol = '{0}'.format(module|upper|replace('.', '_')) %} {% set oncedefine = '{0}QMLPLUGIN_H_'.format(exportsymbol) %} {% set module_name = module.module_name|upperfirst %} -{% include 'common/generated_comment.cpp.tpl' %} +{% include 'common/generated_comment.cpp.jinja' %} #ifndef {{oncedefine}} #define {{oncedefine}} diff --git a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.jinja index 0fe66a3d..4143cab3 100644 --- a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IfRemoteObjectsHelper) {% if targetPlatform == "Android" %} diff --git a/src/tools/ifcodegen/templates/server_qtro/core.cpp.jinja b/src/tools/ifcodegen/templates/server_qtro/core.cpp.jinja index 6c79b54e..dce87c0e 100644 --- a/src/tools/ifcodegen/templates/server_qtro/core.cpp.jinja +++ b/src/tools/ifcodegen/templates/server_qtro/core.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = "Core" %} #include <QtDeprecationMarkers> diff --git a/src/tools/ifcodegen/templates/server_qtro/core.h.jinja b/src/tools/ifcodegen/templates/server_qtro/core.h.jinja index 69106c6f..dfe0a781 100644 --- a/src/tools/ifcodegen/templates/server_qtro/core.h.jinja +++ b/src/tools/ifcodegen/templates/server_qtro/core.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = "Core" %} #ifndef {{class|upper}}_H diff --git a/src/tools/ifcodegen/templates/server_qtro/main.cpp.jinja b/src/tools/ifcodegen/templates/server_qtro/main.cpp.jinja index e5497a0d..3d28301b 100644 --- a/src/tools/ifcodegen/templates/server_qtro/main.cpp.jinja +++ b/src/tools/ifcodegen/templates/server_qtro/main.cpp.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include <QCoreApplication> #include <QCommandLineParser> #include <QDir> diff --git a/src/tools/ifcodegen/templates/server_qtro/server.pri.jinja b/src/tools/ifcodegen/templates/server_qtro/server.pri.jinja index 87f03939..bf8445f9 100644 --- a/src/tools/ifcodegen/templates/server_qtro/server.pri.jinja +++ b/src/tools/ifcodegen/templates/server_qtro/server.pri.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} QT += interfaceframework remoteobjects ifremoteobjects_helper diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.jinja index d85bee8f..fd2776f4 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} set(QT_NO_PRIVATE_MODULE_WARNING ON) diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.jinja index ee0ff05e..42f602a9 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.jinja @@ -3,8 +3,8 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}QtRoAdapter'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} #include "{{interface|lower}}adapter.h" diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.jinja index b84f6fce..d19e3ffd 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.jinja @@ -3,8 +3,8 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = '{0}QtRoAdapter'.format(interface) %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} {% set oncedefine = '{0}_{1}_H_'.format(module.module_name|upper, class|upper) %} diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/core.cpp.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/core.cpp.jinja index 6c79b54e..dce87c0e 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/core.cpp.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/core.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = "Core" %} #include <QtDeprecationMarkers> diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/core.h.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/core.h.jinja index 69106c6f..dfe0a781 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/core.h.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/core.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set class = "Core" %} #ifndef {{class|upper}}_H diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/main.cpp.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/main.cpp.jinja index 75f3dcef..83979395 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/main.cpp.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/main.cpp.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include <QGuiApplication> #include <QCommandLineParser> #include <QDir> diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.jinja b/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.jinja index 07dcb8ec..4486c287 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.jinja +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.jinja @@ -3,7 +3,7 @@ # Copyright (C) 2019 Luxoft Sweden AB # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} QT += gui remoteobjects ifremoteobjects_helper ifremoteobjects_helper_private diff --git a/src/tools/ifcodegen/templates/test/CMakeLists.txt.jinja b/src/tools/ifcodegen/templates/test/CMakeLists.txt.jinja index 6dc6b753..481011ef 100644 --- a/src/tools/ifcodegen/templates/test/CMakeLists.txt.jinja +++ b/src/tools/ifcodegen/templates/test/CMakeLists.txt.jinja @@ -2,7 +2,7 @@ # Copyright (C) 2021 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cmake.tpl" %} +{% include "common/generated_comment.cmake.jinja" %} qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} diff --git a/src/tools/ifcodegen/templates/test/main.cpp.jinja b/src/tools/ifcodegen/templates/test/main.cpp.jinja index c171b6c7..f6997fad 100644 --- a/src/tools/ifcodegen/templates/test/main.cpp.jinja +++ b/src/tools/ifcodegen/templates/test/main.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set testCases = ["InitBackend", "WithoutBackend", "InvalidBackend", "ClearServiceObject", "ChangeFromBackend", "ChangeFromFrontend", "Methods", "Signals", "Models"] %} #include <QtTest> {% for interface in module.interfaces %} diff --git a/src/tools/ifcodegen/templates/test/module.pri.jinja b/src/tools/ifcodegen/templates/test/module.pri.jinja index dca851a9..b864b81a 100644 --- a/src/tools/ifcodegen/templates/test/module.pri.jinja +++ b/src/tools/ifcodegen/templates/test/module.pri.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.qmake.tpl" %} +{% include "common/generated_comment.qmake.jinja" %} HEADERS += \ {% for interface in module.interfaces %} diff --git a/src/tools/ifcodegen/templates/test/tst_test.cpp.jinja b/src/tools/ifcodegen/templates/test/tst_test.cpp.jinja index b34a807b..3dfaa370 100644 --- a/src/tools/ifcodegen/templates/test/tst_test.cpp.jinja +++ b/src/tools/ifcodegen/templates/test/tst_test.cpp.jinja @@ -4,8 +4,8 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% import 'common/qtif_macros.j2' as qtif %} -{% include "common/generated_comment.cpp.tpl" %} +{% import 'common/qtif_macros.jinja' as qtif %} +{% include "common/generated_comment.cpp.jinja" %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} {% set testModels = false %} {% for property in interface.properties if not once %} @@ -27,7 +27,7 @@ using namespace Qt::StringLiterals; {% for property in interface.properties %} {% if property.type.is_model %} -{% include "pagingmodel.h.tpl" %} +{% include "pagingmodel.h.jinja" %} {% endif %} {% endfor %} diff --git a/src/tools/ifcodegen/templates/test/tst_test.h.jinja b/src/tools/ifcodegen/templates/test/tst_test.h.jinja index 07635948..f49d6ea5 100644 --- a/src/tools/ifcodegen/templates/test/tst_test.h.jinja +++ b/src/tools/ifcodegen/templates/test/tst_test.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %} #include <QtTest> diff --git a/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.cpp.jinja b/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.cpp.jinja index 0cb4a470..7d64c553 100644 --- a/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.cpp.jinja +++ b/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include "tst_custom.h" diff --git a/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.h.jinja b/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.h.jinja index 984f3d79..626246f2 100644 --- a/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.h.jinja +++ b/tests/auto/core/ifcodegen/custom-template/templates/custom-test/tst_custom.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include <QTest> diff --git a/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.cpp.jinja b/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.cpp.jinja index 1c96264e..4d0efd62 100644 --- a/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.cpp.jinja +++ b/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.cpp.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include "tst_custom.h" diff --git a/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.h.jinja b/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.h.jinja index 984f3d79..626246f2 100644 --- a/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.h.jinja +++ b/tests/auto/core/ifcodegen/custom-template/templates/legacy-custom-test/tst_custom.h.jinja @@ -4,7 +4,7 @@ # Copyright (C) 2018 Pelagicore AG # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #} -{% include "common/generated_comment.cpp.tpl" %} +{% include "common/generated_comment.cpp.jinja" %} #include <QTest> |