aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/configure.cmake
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Fix lookup of Python for qtdeclarativeAlexandru Croitor2022-01-241-7/+6
| | | | | | | | | | | | | | | | | | | Always use FindPython instead of find_program because the former looks for Python in more locations (like the Windows registry). We switch to FindPython instead of FindPythonInterp because the latter is deprecated, and the former is available in our minimum support CMake version (3.16). Because find_package is called in configure.cmake that is called by a function() call, we need to make the found interpreter a cache variable to make it available outside of the function. Fixes: QTBUG-99273 Change-Id: Idb6620a01b4b5764f130f9dc5780d73cd2151965 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit e0eb75b2a0578f4ef401bb6eaa8c4f320ffa2078) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Unconditionally require std::make_uniqueFabian Kosmale2021-05-251-21/+0
| | | | | | Change-Id: I69fc84a192901889e0e69d28a355db57a1b0cccf Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix build without features.itemmodelTasuku Suzuki2021-04-151-2/+1
| | | | | Change-Id: I12073e43b34d7c72b441aaf081e4210a3161b4e8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Disable JIT for arm64 when doing macOS universal buildsAlexandru Croitor2021-04-031-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our current approach to building universal macOS Qt is to pass 2 -arch flags to clang, which underneath spawn 2 clang invocations with each separate arch and lipo-s the result together. This approah also meanss that we do only one set of config tests for the main (first) architecture. Currently Qml doesn't support JITing for macOS on Apple Silicon (arm64), but if the first architecture is x86_64, the qml_jit feature will be set to 'true', and cause compilation errors when trying to build the arm slice of the jit source files. To circumvent that, and allow skipping compilation of JIT specific code, we have to apply the same trick we do in qtbase, which is to set a compile definition that takes the current architecture into account, and surround all relevant code with an #if block taking to account both the feature and current architecture. Use a custom hacky qt_extra_definition call to redefine the value of QT_FEATURE_qml_jit based on the original feature value and the current architecture. Additionally, surround the jit source files with #if QT_CONFIG(qml_jit). Amends 561a2cec9b95b22783a00b48078b532010357066 Task-number: QTBUG-85447 Change-Id: I28b286d218333076223177c456175f180888a667 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix configure error when LTTng enabledHyungchan Kim2021-03-181-0/+3
| | | | | | Change-Id: I4692a88162739dc7c41d082b4011991ac19f4bc1 Reviewed-by: Hyungchan Kim <hyungchan2.kim@lge.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Introduce XmlListModel to QtDeclarativeIvan Solovev2021-03-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | XmlListModel was previously a part of QtXmlPatterns, which would not be a part of Qt 6. The idea of this commit is to move a simplified version of XmlListModel to QtDeclarative, so that it could be used at least in the examples of different Qt modules. Unlike the old implementation, this version does not have an XPath support. This results in a reduced feature set - the user can't build complicated XPath queries to populate model roles. Now the user can select an xml element and, optionally, an attribute, which will be used to extract the data. [ChangeLog][XmlListModel] Introduce an XmlListModel QML model to create read-only models from XML data. This is a simplified version of a model from QtXmlPatterns, which would no longer be a part of Qt 6. This model supports only simple slash-separated paths and, optionally, one attribute for each element. Task-number: QTBUG-89817 Change-Id: I4186587dc1445dd981ac92b4ce104434236a32b9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* CMake: Regenerate configure.cmake filesAlexandru Croitor2020-06-041-0/+22
| | | | | | | | | This will cause cmake to show the usual configure reports. Needed to add a custom function to find python (not currently used though, except for the configure report). Change-Id: Id68efc5badeaa30834a37fe751c1d5b6bfd96d92 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Update Apple platform defines after rename in qtbaseTor Arne Vestbø2020-03-171-2/+2
| | | | | Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Post merge fixesLeander Beernaert2020-01-241-12/+12
| | | | | Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Post Merge FixesLeander Beernaert2019-11-251-0/+5
| | | | | Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-241-0/+6
| | | | Change-Id: I52b2d17d9334313e4b3d84b52432f2ebc77f7415
* Initial CMake portAlexandru Croitor2019-06-031-0/+178
Crude port of QtQml, QtQmlModels, QtQuick and a few tests and a few examples. Task-number: QTBUG-74136 Change-Id: I5de4d8215b33d1a4a72c2c0e7951e4b384f27e3e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 13:26:06 +0000