summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate coreliob/io testsAlexandru Croitor2019-08-1537-184/+615
| | | | | | | | | | | | With a few special cases to make the tests pass. Biggest one is the qlockfile_test_helper. Also a few tests have some problems and have not been ported yet: qfileselector, qresourceengine, qprocess. Change-Id: I91a5210b13e7a0697774d909449a71f46af0a0ba 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-152-6/+65
| | | | | | | | | | | | | | | | | | | | | | 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-1510-23/+23
| | | | | | | | 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-142-12/+48
| | | | | | | | | | | | | | | | | 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>
* Wrap resource file paths in quotesAlexandru Croitor2019-08-121-0/+7
| | | | | | | | | | This is required for paths that contain spaces, otherwise the .qrc file generated by the build system is invalid, and the RCC run fails at build time. Change-Id: I887100b08052b49dd7ea4dd92b94f357a7d9d16e Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate CMakeLists for tests/corelib/ioJędrzej Nowacki2019-08-1216-0/+452
| | | | | | | | | Only qdir, qlockfile, qprocess and qresourceengine were manually disabled, otherwise all other builds fine on linux. Change-Id: I09fd0ffffb778057d6bf9c25cad1fcd73fb7e530 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add QT_QML_DEBUG define conversionLeander Beernaert2019-08-121-0/+3
| | | | | | | | Add QT_QML_DEBUG to target when we have qml_debug in qmake's CONFIG variable. Change-Id: I266c7313db12667498d4f770c73aec9e79c0b50e 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 resource prefix calculationSimon Hausmann2019-08-091-0/+2
| | | | | | | | tools/qml/qml.qrc uses prefix="something", which means that the leading slash is implied. Change-Id: Ia856fcef36873442a84b9162f1901cb31ca37b49 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix cases where DESTDIR equals ./ or ../Leander Beernaert2019-08-091-0/+2
| | | | | | | | | | When DESTDIR has relative paths as a parameter we should prefix those with ${CMAKE_CURRENT_BINARY_DIR} in order for them to be placed in the correct location. Change-Id: Ie9e9d656cbb54457bdf99425e3e1b05e09f20d7c Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@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>
* Add support for immediate resourcesSimon Hausmann2019-08-091-34/+60
| | | | | | | | | | Collect files passed to RESOURCES and write out an add_qt_resources() call. Similarly, for each "object" passed to RESOURCES (not a file), write add_qt_resources(), too. Change-Id: Idbb368ebb4d003a48e7c47ebaf53a78f65ebf9b9 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix add_qt_resource behavior with regards to unspecified prefixesSimon Hausmann2019-08-099-53/+62
| | | | | | | | | | | 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>
* Fix linking of tst_qtcpsocket on LinuxSimon Hausmann2019-08-091-0/+6
| | | | | | | | | | The direct use of pthread_yield() requires pthread linkage, which -- according to the cmake docs -- is best done by using CMake's Threads::Threads target and the -pthread compiler flag preference. Change-Id: Iacbd7dfce3ee2f792cea7f58d52b6b8ba8a84b18 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Simplify resource embedding for qml modulesSimon Hausmann2019-08-093-19/+9
| | | | | | | | | | | | | | | | | | | | * 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
* Fix dependencies for source file generated through rccLeander Beernaert2019-08-091-1/+1
| | | | | | | | | There was a missing dependency rule which would cause the generated cpp file to not be updated when changes were made to a qrc file generated through add_qt_resource(). Change-Id: I9544c2fb6cf49529913f731b8fb6fc524d65e40c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add support for QTQUICK_COMPILER_SKIPPED_RESOURCESSimon Hausmann2019-08-092-4/+13
| | | | | | | | | Detect this in the conversion script and map it to a source file property. When that's the case, avoid repeating the file list but instead store it in a variable. Change-Id: If3119d83914bb798766e27351746b4e867bd3ab3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Minor variable naming cleanupSimon Hausmann2019-08-091-4/+4
| | | | | Change-Id: I47f07a22c356ca545052f63788756068a51c3e39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix sourceless qml test caseLeander Beernaert2019-08-091-40/+45
| | | | | | | | | Minor tweaks to make sure QML test cases without source files work as expected. Change-Id: I30b72622692b8f36d01f7a17b9d1456b0ab223ea Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Enable quick compiler for qml files in add_qt_resourceLeander Beernaert2019-08-091-164/+158
| | | | | | | | | | | | | | | File passed into add_qt_resource are check to see if they match valid qml files extension. Those which match the latter are then processed by the qt quick compiler should the qmlcachegen target be present. We also ensure that any remaining resources are properly chainloaded. If the qmlcachegen target can't be located a warning be will be issued asking for the inclusion of QmlTools in the find_package command. Change-Id: Ieecd38670e15c21d94dc549b31c7d87f2383d9af Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix and streamline header inclusionAlexandru Croitor2019-08-081-35/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | While trying to port qtgraphicaleffects, when trying to configure the project with a non-prefix build, the configuration fails with the following error: CMake Error in src/effects/CMakeLists.txt: Imported target "Qt::Qml" includes non-existent path "../qt_cmake/qtdeclarative_built_developer/include" This is because we incorrectly export public include directories that point to an "/include" folder under the repo build dir, whereas in a non-prefix build the syncqt "/include" folder is actually in the qtbase build dir. Fix this, by introducing a new variable called "foo_repo_include_dir" which will point to the correct include directory regardles of prefix or non-prefix build. This variable is set by qt_internal_module_info. Fix all relevant places to use this new variable. Also streamline and remove any unncessary include directories in all our functions, thus making everything consistent and hopefully easier to understand. Change-Id: Icbe884701275c7754daecadcdba18048b4d779d0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Extend handling of special condtionsLeander Beernaert2019-08-081-2/+2
| | | | | | | | | Extend the hanlding of special condtions outside single line statements. Conditions such as 'qtHaveModule(gui):qtConfig(opengl(es1|es2)?)' would not be handled properly. Change-Id: I992f75311b82d84c574c9cb4ef6d7d648f425d81 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add support for converting qtTargetLibrary() value assignmentsLeander Beernaert2019-08-083-2/+31
| | | | | | | | | | | | | | | | | | Add support to pro2cmake to handle variable assignments via functions, e.g: TARGET = $$qtTargetLibrary($$TARGET). The evalulation of the functions happens during parsing and is very rudementary in nature. Currently it only covers the qtTargetLibrary(), required for certain projects, and quote(), required for passing unit tests. If we run into any unhanlded function an exception will be thrown. This patch also changes the TARGET property on Scope to expand the value. Change-Id: I678b7058067348a3972944bdba110f556cf22447 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* Fix conversion of SUBDIR pro files not in current directoryLeander Beernaert2019-08-081-8/+16
| | | | | | | | | | | | This patch fixes the processing of pro files that do not reside in the current directory. Before this patch statements such as SUBDIRS += Foo/Bar/z.pro would cause z.pro to be parsed in the current CMakeLists.txt. What we want instead is a call to add_subdirectory(Foo/Bar). Failing to do so leads to issues with relative paths specified in z.pro being invalid. Change-Id: I7bfa7837d54877e5340081d1c9aebe855cf6796d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Handle DESTDIR overrideLeander Beernaert2019-08-071-0/+5
| | | | | | | | Set OUTPUT_DIRECTORY on a target when DESTDIR is specified. Change-Id: I72061ae8156356fcb2aa9ba6cb87049fcef600c7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Handle qmake's CONFIG=pluginLeander Beernaert2019-08-071-6/+6
| | | | | | | | | In some tests in qtdeclarative we have projects that are built as a lib with CONFIG=plugin. Without these changes they would be translated to an add_qt_module call. Change-Id: I208d31d43b087ed0b87eb4715f6c49b218fcc2c5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate some of the test projects that do SUBDIRS += fooAlexandru Croitor2019-08-0710-42/+89
| | | | | | | | | This show cases the new cleaner subdirs handling code in pro2cmake. Change-Id: I25001942ef020e4c4191b355f55309c4fb033ecc Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Handle conditions for SUBDIRS *more* correctlyAlexandru Croitor2019-08-071-56/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | There are project files that not only do SUBDIRS -= foo depending on some condition, but also SUBDIRS += foo. To handle these cases correctly we need to do a whole pass across all scopes and collect all addition and subtraction conditions. Once we have that information, we can compute a final condition for a particular subdirectory. After we have the condition information for all subdirectories, we can simplify all those conditions using SimPy, and group all subdirectories that have the same simplified condition. Finally we print out the subdirectories grouped by the simplified condition. The end result is similar to how we have extend_target() calls with multiple sources grouped into a single conditional call, except in this case it's subdirectories. Amends b26b1455d75709a53f50e1d3d41c384f8e90b576. Change-Id: I5b648ac67264ba9a940561baee5b49c43c13b721 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Perform check for tool builds before srcLeander Beernaert2019-08-071-2/+3
| | | | | | | | | | Perform the test whether tools should be built before entering the source directory of a project. In QtDeclarative this would result in a configuration error since the tools are used while building everything under src. Change-Id: I33ce2cb317ef221836d696654f3bb4e39db47e54 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix typo in QtBuild.cmakeLeander Beernaert2019-08-071-1/+1
| | | | | | | Fix typo for set command. Change-Id: I1881bf77cab47ef37081065057200a72a2bc7e8f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix regular expression for add_qml_moduleLeander Beernaert2019-08-061-1/+1
| | | | | | | | Values such as Foo.2 would no longer be converted into Foo due to an error in the regular expression. Change-Id: I6a11d02662782094f5b264f86a930d9aaf002c77 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix shared resource paths in testsLeander Beernaert2019-08-061-1/+10
| | | | | | | | | Resources shared by tests were incorrectly setup. Resources would always be registered with BASE/filename as alias. In these cases the fix is to set the alias with the original file name. Change-Id: I667ce7b74ae5f86740c8bb8a040cc2895a3dc116 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix add_qml_module URILeander Beernaert2019-08-062-9/+9
| | | | | | | | Make sure the URI name for qml modules correctly strips out the version number for instances such as QtQuick.Controls.2. Change-Id: I18e706b371323eeefdd6d7564b922265fa5cad3f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix qml plugin conversion: always install qml filesLeander Beernaert2019-08-061-8/+9
| | | | | | | | | | Always install qml files regardless of whether the install_qml_files configuration is present in qmake. This was causing most unit tests to fail due to missing qml files. Change-Id: I53c7200cfa66805d0e459190ef105c1a73c34a5f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Propagate library/plugin resources automatically when linking staticallySimon Hausmann2019-08-061-1/+14
| | | | | | | | | | | | | The rcc generated code relies on global constructors to register the resources. The object file of the generated code is included by default in shared libraries and executables. However when the object file ends up in a static library, the linker will discard the object file when nothing references any of the symbols in that object file, when linking the static library into the executable/shared library. The solution is to link the object file straight into the final target, by means of a cmake object library. Change-Id: I02ad1173e4f7e8f907022c906640dc9086233676 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix $$_PRO_FILE_PWD substitutionLeander Beernaert2019-08-051-1/+3
| | | | | | | | | | | | | | | | | | PRO_FILE_PWD should return CMAKE_CURRENT_SOURCE dir without any compenstation for mistmatching directory locations as we are doing with PWD. There are test that use a shared .pri project file which gets included into the .pro file of test. In this .pri file we have a statement such as DEFINES += QT_QMLTEST_DATADIR=\\\"$${_PRO_FILE_PWD_}/data\\\". Since the .pri project file is located in ../../shared/shared.pri the substitution would result in ${CMAKE_CURRENT_SOURCE_DIR}/../../shared/data instead of the expected ${CMAKE_CURRENT_SOURCE_DIR}/data. Change-Id: Id899d6a624acc45425af47ca9aa1b332cf63e659 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add __default_public_args to add_qt_test and add_qt_executableLeander Beernaert2019-08-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Due to the missing argument processing on PUBLIC arguments we could run into situations where the defines for an executable (mostly tests) would be incorrectly processed. If one were to pass a define into a test that also specifies public libraries, the defines passed in by test would fall under the PUBLIC_LIBRARIES argument in add_qt_executable. For instance, in a test with DEFINES Foo PUBLIC_LIBRARIES Core would cause arg_DEFINES to be "Foo=BAR;PUBLIC_LIBRARIES;Core". This combined with the defines specified by add_qt_test would result in the following string "Foo=BAR;PUBLIC_LIBRARIES;Core;TEST_DIR=..." and would cause TEST_DIR to be treated as a public library in add add_qt_executable. For some reason I can't figure out, these two defines end up in the linker flag section of certain test programs. There is nothing wrong with the rest of the propagation chain into add_qt_executable. My best guess is that it has something to do with the generators. In any case add an explicit -D fixes the issue. Change-Id: I340790c1c2426fa76785d1bd1b3332a904323d56 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate tests/auto/corelib/kernel.proAlexandru Croitor2019-08-012-11/+51
| | | | | | | | Makes the conditions nicer to look at. Change-Id: If07b4f96892e459a7e7a6a4f541311ebda11b1a8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Implement condition simplification for add_subdirectory conditionsAlexandru Croitor2019-08-011-1/+24
| | | | | | | | | | | This makes the SUBDIRS -= foo conditions simplified and nice to look at. Amends b26b1455d75709a53f50e1d3d41c384f8e90b576. Change-Id: I9ffe3db1e358f94fb65a885cc90c44218482825b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* Regenerate qsocketnotifier testAlexandru Croitor2019-08-012-9/+36
| | | | | | | Remove the previously wrongly committed CMakeLists.gen.txt file. Change-Id: I75e87865a9f2b237d321d29f92e25aee5f7febb9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix pro2cmake to handle QT default values properlyAlexandru Croitor2019-08-011-1/+4
| | | | | | | | | | | | Setting the "QT" SetOperation which defaults to "core" and "gui", should only be done once on the top-level .pro scope. To distinguish the top level scope, we need to check for both an empty parent_scope and an empty base_dir. Amends 9e96c384261ca1329d3143295d013701eb85b186 Change-Id: I9db1cbf0e6592c8c195d11b97b3eff40b1adbcbd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Small fix to correctly handle default argumentsAlexandru Croitor2019-08-011-4/+8
| | | | | | | | Dictionaries are mutable, and should not be assigned as a default parameter. Change-Id: Id08c17f89c17b404560241849603e1e1a0ec6562 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Refactor QML_FILES for add_qml_moduleLeander Beernaert2019-08-013-93/+238
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Properly convert default QT directiveJędrzej Nowacki2019-08-013-2/+5
| | | | | | | | | | | | If unset QT by default has value: "core gui". This patch adds this behavior by pre-defining the value in the root scope. qmimedata CMakeList.txt was re-generated. Change-Id: Ib8b6064bc46c72d829e0077d09f21bbfb494e137 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 21:15:21 +0000