summaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix build of installed header-only modules in non-prefix buildsSimon Hausmann2019-09-051-4/+4
| | | | | | | | | | QtUiTools in qttools is a public module that has only headers, so it's an interface library in cmake. That means INTERFACE_INCLUDE_DIRECTORIES cannot contain paths to the source or build directory, unless they are prefixed with BUILD_INTERFACE, which this patch adds. Change-Id: I047700f447237dfbe5a901072eb413a159ae537d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* cmake: Enable building of the oci pluginVille Voutilainen2019-09-051-0/+48
| | | | | | Change-Id: I003d6da10c7e47402fb373d3956817817328cf0f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Fix qmlcachegen invocation on Windows, part 2Simon Hausmann2019-09-042-9/+7
| | | | | | | | | | | | Fix up the previous commit and use separate COMMAND parameters for add_custom_command to ensure the expansion of the PATH. The injection via -E env "/some/dir;%PATH%" does not work as the dollar expansion is not applied when the ninja command uses cmd /C. This relies now on undocumented behavior of cmake ;( Change-Id: I5b5fc88e4c13f8fb6c6bba3131204c2eb35404d6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix qtdeclarative build on WindowsSimon Hausmann2019-09-042-4/+20
| | | | | | | | | | | | | | Our tools are typically installed into the Qt bin directory, after which they are useable right away on Windows, since the Qt dlls are located there, too. An exception to the rule are tools that are built within a module and used right away. At that point they are in the top-level bin dir of the build directory, along with "local" DLLS they might need, but with the Qt dlls out of reach. To cover this case, we need to prepend a PATH adjusting command when using these with add_custom_command. Change-Id: I7f58581f5060c8004b5d1fa1f6f17297256783de Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove dead codeSimon Hausmann2019-09-041-71/+0
| | | | | | | Change-Id: Iac7c7c77744b43772faf3402566685a674ab8ff3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* cmake: Enable building of the db2 pluginVille Voutilainen2019-09-041-0/+59
| | | | | | Change-Id: I26810cccba5f3128cb47e0bf53b5ec78de2eec8c Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Disable Examples in static buildLeander Beernaert2019-09-031-1/+1
| | | | | | | | | Do not build examples in static builds as they are not prepared for this configuration. Change-Id: Ia0fd0a6cdfa3733bf13eb2ca8398668f26c0bedf Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Prospective fix for linking problems of qtdeclarative in the CISimon Hausmann2019-09-031-5/+5
| | | | | | | | | | | In the ICC configuration we can't build the qtbase libraries with ICC and qtdeclarative with gcc, mixing won't work well. On Windows we've covered this compiler mixing scenario using our toolchain file, but the ICC case makes it clear that we have to be consistent about caching the compiler in the toolchain file across platforms. Change-Id: Iad2005ab00655f902e5f5cea2f0563d790d8aa93 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Enable building of the mysql pluginVille Voutilainen2019-09-021-0/+50
| | | | | | Change-Id: I8cb97afaaed46ee64b5a133e797179d7ddecdeef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Don't include module syncqt header locations if syncqt was not runAlexandru Croitor2019-09-021-17/+27
| | | | | | | | | | | | When building QtQmlDevTools we don't generate syncqt headers, but the non-existent include paths were still added, which means that anything that used QtQmlDevTools would fail to configure (the standalone tests). Make sure to only add the include paths if syncqt was executed. Change-Id: I6d79ecf53e9a5d396e8df801584ce2c9f119f9be Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Decide whether to build tools when doing a standalone test buildAlexandru Croitor2019-09-021-0/+1
| | | | | | | | Needed for qtdeclarative standalone tests. Change-Id: Ie012528d0d553cb63c2d79f3ded35e45872ee89a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Fix add_qt_resource to handle resources in static builds properlyAlexandru Croitor2019-08-301-2/+14
| | | | | | | | | | | | | | | | | | Whenever the qml compiler is used to process qml files from a resource, and there are no resources left after all qml files have been processed, make sure to propagate the created resource target to add_qt_resource, so that the target is associated properly with an export name. Additionally the generated qml cache loader file uses private Qml headers. Thus the object library that contains the cpp file should have qml as a dependency (and not the target that will link to the object library). Change-Id: Ib385a900823df3e015492cdd06acd8a0cb9f8e9a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Override qmlimportscanner path in android deployment settingsLeander Beernaert2019-08-301-1/+10
| | | | | | | | Override the default binary path for qmlimportscanner so that it points to the host build specified via QT_HOST_PATH. Change-Id: Ib0b47e61315c87ce6225e2d8ca84043cae03357d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Android build configurationLeander Beernaert2019-08-303-44/+75
| | | | | | | | | | | | | | | | | | Update Android build configuration to be compatible with the multi-arch android build patch to qmake. We can now build and generate the apk correctly. Executing on the device/simulator will only work once the latest changes from 5.14 have been merged in. We now replace target suffix with ${CMAKE_ANDROID_ARCH_ABI}.[so|a] so we don't have to deal with handling targets which might have any of the OUTPUT_NAME properties set. The dependency and deploy settings generation has also been updated to append the file contents to a string and then do a single file write at the end. Change-Id: Id3c5bd0428141ecaf962124a100390e3a4e41feb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix qtdeclarative static buildsAlexandru Croitor2019-08-301-0/+5
| | | | | | | | qmlplugindump is not build during a Qt static build, so there's no point in creating custom targets that would run the tool. Change-Id: Id7d6d44da63312f298f46eab08a5637cb0c97c8f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix WASM platform detectionSimon Hausmann2019-08-301-1/+1
| | | | | | | | | At the moment we only support building with Emscripten, so that's the system name to look for. Change-Id: I08782ed0201da1593058bf1fb2ec61d6660802ed Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix static builds after revamp of add_qt_resourceAlexandru Croitor2019-08-303-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first issue is that instead of arg_OUTPUT_TARGET we should use rcc_OUTPUT_TARGET (there was also a typo in the OUTPUT word). The second issue came with the fact that the object library targets that were created for resources had a "Qt6::" namespace prefix in the exported Targets files, and yet the link generator expression did not contain the prefix. This failed when building qtsvg in a static build, because the exported object library could not be found. The solution is to use the TARGET_NAME generator expression which takes care of adjusting the name of the target when exported, thus making the linking work both when building qtbase and when building qtsvg. This had the fallout, that all resource object libraries need to be associated with an export set and installed. This wasn't the case for plugins, because plugins have an export name of the form "FooTargets", whereas the export name for the resource object library is "Qt6FooTargets". Adjust the export names of plugins to be the same as for modules and resource library objects (aka contain the "Qt6 prefix"). Change-Id: I1ca28d20c51e4447e5783cc20571a68ec77f6513 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Be more verbose on required environment variablesMaurice Kalinowski2019-08-281-1/+1
| | | | | | | | Make sure to document both variables are required when invoking cmake. Otherwise, one might be omitted causing side-effects. Change-Id: I3390df1cb5352ea6113952c99fcedef5336f2fc1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix "mkspec selection" when building with EmscriptenSimon Hausmann2019-08-281-0/+2
| | | | | Change-Id: Id9d466221294651c2f8dfde149d82f45b4081238 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix CMake errors around linker flags when targeting WASMSimon Hausmann2019-08-281-1/+4
| | | | | | | | | | | * The -no-undefined linker option only makes sense for shared libraries. The WASM build is a static build though. * The -gc-sections linker option is only relevant for host tools and certainly applicable to the WASM toolchain. Change-Id: Ib8daec66a6d80f5025887448882dd891e6176268 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix architecture detection with WASM buildsSimon Hausmann2019-08-281-0/+11
| | | | | | | | | This is a simple mis-understanding between try_compile assuming interest in the launching part of the thing we try to compile and our architecture test being interested in the binary. Change-Id: Ie972b662b6f34699f566649bb2c1e29da35b58c3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add missing qml-root-path for AndroidLeander Beernaert2019-08-283-18/+23
| | | | | | | | | | | | Add missing qml root path variable in the deployment configuration file. Not having this variable will cause androiddeployqt not use the qml dependency scanner to package all relevant dependencies. This patch also fixes QT_ANDROID_BUNDLED_FILES files not being processed. Change-Id: I5bca33cdbb57098f283b38516b777571806da9e5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix qt_get_module_for_plugin to work with interface librariesAlexandru Croitor2019-08-281-0/+7
| | | | | | | | | Assume that interface libraries can't have plugins for now, otherwise we'll need to change the "MODULE_PLUGIN_TYPES" property name to include INTERFACE_ as a prefix. Change-Id: I21b64179ded5fd10216d843a21ee149e002793f3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add OUPUT_DIRECTORY option to add_qt_testLeander Beernaert2019-08-261-3/+6
| | | | | | | | | | From all the observed cases, the parameters given to OUTPUT_DIRECTORY tend to be CMAKE_CURRENT_BINARY_DIR, which was the default value. This change is mainly to avoid add_qt_test failing if OUTPUT_DIRECTORY is specified. Change-Id: I26b931dd33ad1e991b64c14cc11b4b7a713fc858 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Do not use quick compiler with embedded test dataLeander Beernaert2019-08-231-0/+7
| | | | | | | | | Prevent the quick compiler running on embedded test data for platforms such as Android. This breaks certain assumptions about the test setup otherwise. Change-Id: I1026da3e16552256623de26b843ea32ed2c4260e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Skip emebedding test data when there is no targetLeander Beernaert2019-08-231-14/+17
| | | | | | | | | On android test data is embedded into to the binary via resources. This will not work with sourceless tests such as the qml only test cases. Change-Id: I3ecf28223b3c7c6dae4ca3f15519adc028082598 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Link against Qml when using quick compilerLeander Beernaert2019-08-231-1/+1
| | | | | | | | When using the quick compiler to compile qml files, add an explicit dependency on Qml. This will result in linker errors otherwise. Change-Id: Ib7af0e8ec1b48822fd0d3c3556f10d24f10e7489 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for Qt header_modules aka a header only INTERFACE libraryAlexandru Croitor2019-08-232-46/+111
| | | | | | | | | | Also add support for modules that have no private module counterpart. Both are needed for Designer's QtUiPlugin in qttools. Change-Id: Ia7e9d8837140e1de5cd59e196b4f63481ab68298 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Qt CMake Build Bot
* Add some clarifying documentation in QtPostProcessAlexandru Croitor2019-08-231-0/+13
| | | | | | | | | | Specifically what each of the list variables in qt_internal_create_module_depends_file is used for. Change-Id: Ie4f8c0d7387308518932d37e802ecaeb0572b955 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Fix creation of ModuleDepends header file with correct dependenciesAlexandru Croitor2019-08-231-1/+3
| | | | | | | | | | The content of the generated header files should reference both public and private Qt module dependencies. This is the same as what qmake does. Change-Id: I2e47c93291d677b86af7bb80fb788b2acf939743 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Qt CMake Build Bot
* Abstract and fix usages of QT_KNOWN_MODULESAlexandru Croitor2019-08-232-20/+44
| | | | | | | | | | | | | | | | | In some places of the build system we need to iterate over repo specific Qt known modules (aka the ones that are built in the current project). In other places we need to iterate over the whole list of known Qt modules (those found via find_package + the ones built in the current project). Introduce two separate functions that provide access to either the former or latter, and adjust all existing usages of QT_KNOWN_MODULES as needed. Change-Id: Ica96d0cfe690b9aaaa3f8c53bc84975bccad69c7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Replace invalid symbols with underscoreLeander Beernaert2019-08-221-0/+1
| | | | | | | | | When building tests for android some resources names had the "#" character in them which triggered a CMake error when use in conjunction with add_custom_target() Change-Id: If5f471eebb027683e86b0c4e38c2f34ff8891b7a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix missing prefix for test data on androidLeander Beernaert2019-08-221-0/+1
| | | | | | | | Add missing required resource prefix to add_qt_resource() call when embedding test data as a resource. Change-Id: I9130f9ae863daae80221a1475b077b1d2e501f6d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Extract add_qt_resource into reusable componentsLeander Beernaert2019-08-223-259/+318
| | | | | | | | | | | | | | | | | | | | | | | | This patch moves all of the underlying code for add_qt_resource into a common reusable snippet for both the Qt build and user projects. For users, the new API is available under QT5_ADD_RESOURCES. If outfiles is a CMAKE target we will use the new API, otherwise we will fall back to the old behavior. This patch also adds EXTRA_CMAKE_FILES and EXTRA_CMAKE_INCLUDES to add_qt_module so that module specific cmake files can be installed and loaded by the module's config.cmake. The code will be installed under CMAKE_BINARY_DIR/Qt{}CoreResource.cmake and is injected into Qt{}Core_Config.cmake via the extra cmake includes passed into add_qt_module. To make sure it still works with QtBuild, we do the actual generation of the file from QtBaseGlobalTargets and include the generated file there as well. Change-Id: I85fefaa11dde01a6790d23c62d6a64cd157e2617 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix Android build for other Qt modulesLeander Beernaert2019-08-162-1/+5
| | | | | | | Install missing QtBuildInternalsAndroid to installation path. Change-Id: I6141ff72b57a6445f1718bc17d64a7ed59a91620 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix QT_WILL_BUILD_TOOLS evaluationLeander Beernaert2019-08-161-1/+5
| | | | | | | | | This condition was not being properly evaluated since the cached variable was treated as a string. Any checks with if(QT_WILL_BUILD_TOOLS) would just verify whether the string was empty or not. Change-Id: Ie8b9ecc8249a1e9f5c0aa1b13d5bef686fcb04de Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix developer warnings that a plugin does not belong to a Qt moduleAlexandru Croitor2019-08-161-2/+6
| | | | | | | | | | | | | | | | | | | | When building qtsvg or qtimageformats there are a bunch of configuration warnings like: The plug-in 'qtiff' does not belong to any Qt module. This happens because qt_get_module_for_plugin() checks for modules only in the QT_KNOWN_MODULES variable. find_package()'d modules will not appear there though, but only in QT_ALL_MODULES_FOUND_VIA_FIND_PACKAGE. Change the function to check for Qt modules in both variables. This fixes all the warnings regarding plugins not belonging to a module. Change-Id: I39e668801a93794b62888cf868b97c55f57dccdd Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix copying / installing of testdata to proper locationAlexandru Croitor2019-08-151-1/+1
| | | | | | | | | | | | | | | | I don't know why, but previously the test data was copied to "test_build_dir/testdata" subfolder. That's incorrect, there's no need for a testdata subfolder, the copied / installed contents should go directly under the test build dir / install dir. Incidentally this will make the corelib/io/qdir tests to pass. Amends 1307736c7db1ff24e3b8282f4a7b14d24866feba . Change-Id: I9e180d608433fe82f4a29afea7f594507e6020d3 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Handle test helpers betterAlexandru Croitor2019-08-151-4/+56
| | | | | | | | | | | | | | | | | | | | | | Teach pro2cmake to use add_qt_test_helper instead of add_qt_executable when the qmake 'qt_test_helper' feature is used. Don't use macOS bundles when building tests on macOS, because that breaks path assumptions for certain tests. Introduce a new OVERRIDE_OUTPUT_DIRECTORY option for add_qt_test_helper that allows placing the binary into a folder other than the test parent folder. I considered changing the default behavior not to place into the parent folder, but that would break all existing tests, so I opted for override approach instead. Ultimately we might want to revisit this later. Change-Id: I68fd1dea608333c2af0d3896050b40a6964dd87f Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Rename alias property on source files to QT_RESOURCE_ALIASLeander Beernaert2019-08-151-2/+2
| | | | | | | | Rename the alias property used by add_qt_resource() to QT_RESOURCE_ALIAS to match property naming conventions. Change-Id: I97b12b0b794e158f03dabeed5ec23a3b7d56cfbb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for QtQuikCompiler retained resourcesLeander Beernaert2019-08-141-0/+21
| | | | | | | | | | | | | | | | | Support translating the QTQUICK_COMPILER_RETAINED_RESOURCES variable. Fix missing PROPERTIES keyword for set_source_files_properties() commands. Apply source file properties to standalone source files as they appear in the project as it was possible for them to inherit values that were not meant for them. When creating resource lists, prefix them with the resource name to avoid collisions. Change-Id: I69ef85ea9414c0e7c07b1ebfb76d24bd878ce70f Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix QRC Resource paths for qrc files in subdirectoriesLeander Beernaert2019-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When pro2cmake converts qrc files that are located in a subdirectory there is an error in the resource paths for qrc files generated with add_qt_resource(). For instance, consider the contents of data/scenegraph.qrc: <RCC> <qresource prefix="/qt-project.org/scenegraph"> <file>"shaders/24bittextmask.frag"</file> </qrsource> <RCC> After processing by pro2cmake and add_qt_resource() we generate <RCC> <qresource prefix="/qt-project.org/scenegraph"> <file alias="data/shaders/24bittextmask.frag"> ${CMAKE_CURRENT_SOURCE_DIR}/data/shaders/24bittextmask.frag" </file> </qrsource> <RCC> The expected qrc path for the resource should be prefix/shaders/..., but in CMake it becomes prefix/data/shaders/... due to the BASE parameter. To fix it we check whether BASE is set and whether there are no other aliases present on the source file before setting an alias with the original file path. Change-Id: If0a68a5ffa787704b10b740e20f875c9029509b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Export architecture config test variablesLeander Beernaert2019-08-143-1/+12
| | | | | | | | | Export the architecture configuration variables from QtBase. There are other modules that require access to this information in order to enable certain features (e.g: qml_jit in QtDeclarative). Change-Id: If2c7f29ccb1c0b0a0db3d78ad133a2a6be12b5ad Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add substituition rule to qt_internal_module_infoLeander Beernaert2019-08-121-0/+1
| | | | | | | | Added substituion rule to qt_internal_module_info to replace '.' with '_'. Fixes compile errors for targets with names such as Plugin.2. Change-Id: I0754c771bdc456a8a8f450fba90792c98d276c92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Install QtPlugins.cmake.inLeander Beernaert2019-08-121-0/+1
| | | | | | | Added rule to install missing QtPlugins.cmake.in. Change-Id: I485dadd56ee2dd435406d97399b32dc6390cebff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change quick compiler generated code pathLeander Beernaert2019-08-121-3/+3
| | | | | | | | | We now compile all qml files from the quick compiler in separate directories qmlcache/${resource_name} to prevent issues where the same qml file is present in more than one resource file. Change-Id: I6857ff6aaaa21112896d5d39bbe11d3ffe524ec8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix QuickCompiler Setup ErrorsLeander Beernaert2019-08-091-1/+7
| | | | | | | | | | | | If the variable resource_files existed in the parent scope, the list would now be duplicate. Fix case where TO_CMAKE_PATH didn't properly convert //Foo into /Foo, so wee need to handle this manually. Change-Id: I73f1b4db82f6a80ba00da928b39091ac6c968a02 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix add_qt_resource behavior with regards to unspecified prefixesSimon Hausmann2019-08-091-0/+3
| | | | | | | | | | | This change makes the PREFIX parameter a required parameter if the target does not specify a default. This way the behavior is clear when reading the code: add_qt_resource() without PREFIX means it must come frmo the target. Change-Id: I79024e70e7b4d32a5164b93aa08ec9ff409b2d39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Simplify resource embedding for qml modulesSimon Hausmann2019-08-092-12/+8
| | | | | | | | | | | | | | | | | | | | * Add support for a QT_RESOURCE_PREFIX target property, that add_qt_resource respects. This makes it convenient to add files to the resource system for a project without the need to repeat prefixes. In qmake land with multiple resources they're repeated in the foo.prefix variables or in the prefix attribute in .qrc files. * Since /qt-project.org/imports is in the default QML import search path and the hierarchy under the import search paths is "regulated", we might as well make add_qml_module set QT_RESOURCE_PREFIX on the target. We can compute the correct value for that. This allows removing the redundant prefix from the add_qt_resource() calls for the qml files. Change-Id: Ic15130dc9e432340fc3edf93e35f2a803b4b40eb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Remove unused parameters for add_qml_moduleSimon Hausmann2019-08-091-2/+0
| | | | | | Change-Id: Ic7774aa401089061b153920e51537e1c2264ce4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 17:31:46 +0000