diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-01 15:43:36 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-01 14:07:01 +0000 |
| commit | 97b76704ea3b3a062a912656809b17d434f31ffe (patch) | |
| tree | ea6f8214815c1af605ce186f1861c67bbfec9eef /cmake/QtProperties.cmake | |
| parent | 9e96c384261ca1329d3143295d013701eb85b186 (diff) | |
Refactor QML_FILES for add_qml_module
It has been decided, that going forward all qml files are to be added
to a module via the resource system. This patch does the ground work
to make sure all qml modules in the qt codebase follow these new
conventions.
New properties on targets have been added so that we can't track all the
qml related information for later use.
To make sure it is still possible to install qml files we added the
qt_install_qml_files() command.
Pro2cmake has been adjusted to handle the special cases of versioned
qml modules (e.g: QtQuick.2). It will now insert a TARGET_PATH
override to avoid the default conversion from the URI parameter.
Finally, this patch temporarliy disables the quick compiler by moving
all relevant code into a dummy function. This will be removed in a
follow up patch where the quick compiler will be enable for all
qml files present in resource files.
Change-Id: I09fe4517fad26ec96122d9c7c777dbfbd214905c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/QtProperties.cmake')
| -rw-r--r-- | cmake/QtProperties.cmake | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/cmake/QtProperties.cmake b/cmake/QtProperties.cmake index 0c3507b953..5cc8ca7b11 100644 --- a/cmake/QtProperties.cmake +++ b/cmake/QtProperties.cmake @@ -59,3 +59,38 @@ define_property(GLOBAL "" ) +define_property(TARGET + PROPERTY + QT_QML_MODULE_TARGET_PATH + BRIEF_DOCS + "Specifies the target path for a qml module" + FULL_DOCS + "Specifies the target path for a qml module" +) + +define_property(TARGET + PROPERTY + QT_QML_MODULE_URI + BRIEF_DOCS + "Specifies the URI for a qml module" + FULL_DOCS + "Specifies the URI for a qml module" +) + +define_property(TARGET + PROPERTY + QT_QML_MODULE_RESOURCE_PREFIX + BRIEF_DOCS + "Specifies the qml module's resource prefix." + FULL_DOCS + "Specifies the qml module's resource prefix." +) + +define_property(TARGET + PROPERTY + QT_QML_MODULE_VERSION + BRIEF_DOCS + "Specifies the qml module's version." + FULL_DOCS + "Specifies the qml module's version." +) |