diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2021-05-26 10:30:58 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2021-05-26 18:05:01 +0200 |
| commit | 9ff40ad1b2376e66a1af81fb8cd5b7991820d00a (patch) | |
| tree | 25c4e11adceafa327a62899bb76bcd838558e840 /src | |
| parent | 6a14fc6172f687fbbbc6a5a5d0df081508fd2d41 (diff) | |
| download | qtivi-9ff40ad1b2376e66a1af81fb8cd5b7991820d00a.tar.gz | |
Make the ivicore examples to be fully functional again
* Generation of QML Plugins fixed to work out of the box
* Use correct folder structure for executables and plugins
* Add optional DBus dependency for qface-tutorial
* Remove the shader-effect from the qface-tutorial
Change-Id: I212eade621ac9d741e1f0fe75ceef2c59c312865
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl | 1 | ||||
| -rw-r--r-- | src/tools/ivigenerator/templates/qmlplugin/CMakeLists.txt.tpl | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl index 93cad4a..a6d23ea 100644 --- a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl @@ -3,7 +3,6 @@ set(${CURRENT_TARGET}_SOURCES {{interface|lower}}backend.cpp {% endfor %} {{module.module_name|lower}}simulatorplugin.cpp - {{module.module_name|lower}}_simulation.qrc ) qt_add_resources(${CURRENT_TARGET}_SOURCES diff --git a/src/tools/ivigenerator/templates/qmlplugin/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/qmlplugin/CMakeLists.txt.tpl index 435b92a..2068acc 100644 --- a/src/tools/ivigenerator/templates/qmlplugin/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/qmlplugin/CMakeLists.txt.tpl @@ -2,6 +2,7 @@ # Keep it until the templates have been adapted and everything can be done without autogenerating if (NOT TARGET ${CURRENT_TARGET}) + string(REPLACE "." "/" TARGET_PATH "{{module|qml_type}}") qt_add_qml_module(${CURRENT_TARGET} URI "{{module|qml_type}}" VERSION "{{module.majorVersion}}.{{module.minorVersion}}" @@ -9,7 +10,7 @@ if (NOT TARGET ${CURRENT_TARGET}) # TODO remove this again # This is needed to make the test build work as it would create duplicate qmldir entries # in the global qml folder - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_PATH} PUBLIC_LIBRARIES Qt::IviCore SOURCES |