summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4' in qt/qtinterfaceframework6.4Qt Submodule Update Bot2023-02-211-4/+4
| | | | | Change-Id: I53d6b4cec7a58a118b795927edc535641a5d341c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the venv creation using Python 3.11 on DebianRobert Griebl2023-02-152-5/+14
| | | | | | | | | | | | - re is not just re.py anymore - libssl is not a hard dependency anymore - the lib64 directory may not even be there to begin with Change-Id: I945f8edbb11f58278b42a6893214ff82e4f882fb Reviewed-by: Zoltan Gera <zoltan.gera@qt.io> Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 3ae219138f3b5bd0ec2b122bb3a19bd2cf0b358b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix improper handling of qmake variables when creating a virtualenvZoltan Gera2023-02-141-2/+4
| | | | | | | | | | | | | The qmake function $$first only accepts a variable and does not work on substituted strings. In the latter case, it returns an empty value. As a result PYTHONPATH became /site-packages without a proper lead-in path. Some platforms can handle this but on most a full path is expected. Change-Id: Ieb9e13369190036ed1806086dd93810df5921619 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit e1dbb23b2c965c8a3867e79fd3b1b99bf9524b1f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-02-101-4/+4
| | | | | Change-Id: I778e452d797e3ff59fb545cfa05e28c3078f2ffb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ifcodegen: Fix windows virtualenv deploymentDominik Holland2023-02-071-1/+1
| | | | | | | | | | | | Also copy the python.exe from the original installation into the virtualenv. The python.exe created by virtualenv seems to be special wrapper, which always forwards to the original installation. Fixes: QAA-1724 Change-Id: I7b175fc8416a895f4edc933adba6dd32f2985b87 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 85166a8fcd8e46eb3129192bc3d35c5273e52474) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-02-021-4/+4
| | | | | Change-Id: Ief1111011bb82c63eec4a2fee98e3567ef300d95 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-311-4/+4
| | | | | Change-Id: Iee554d0c8e928782be5e5f5cc1aecbb4b5620699 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-251-4/+4
| | | | | Change-Id: I273cd702572afdbb7fe1aca61702d4c666b870be Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-241-4/+4
| | | | | Change-Id: I5f82a2eeca98b8453eb683bc8dc6f4b920ed68a8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-231-4/+4
| | | | | Change-Id: I7d2560a36c2adff14d08757cdad26bbe3c988dae Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-201-4/+4
| | | | | Change-Id: I03ed7fbd7dc52c582a51af0fa5c70eb2575a9b31 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-181-4/+4
| | | | | Change-Id: Ic7c2aa3abe4c4c0d07d06c3b9684ba17abfad8f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-171-4/+4
| | | | | Change-Id: I537d72d7e904eaab7e1f2ca9e564fe60417ef8a4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-161-4/+4
| | | | | Change-Id: I17b07b2c90fadc3878a2305c05eb4fbed4062199 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-131-4/+4
| | | | | Change-Id: Ife683a97daadbdaba61cab2b465273e4c76c8bcc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Improve the deploy-virtualenv.bat to work with a python from the app storeDominik Holland2023-01-121-18/+5
| | | | | | | | | | | | | | | | | | | When python is installed from the Microsoft App Store the installation is split. Usually the created virtualenv indicates where the base_prefix is and we can use that to copy all needed files. With that special python version the virtualenv doesn't contain the base_prefix location and we don't know where to copy the files from. Instead of relying on the virtualenv config files, we now ask python itself about it's base_prefix. Fixes: QTBUG-109936 Change-Id: Ic2576f32fe01d50a2d575e3332ef2fc7124ca2d6 Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit af1cce5cbb98b1b3d378693d4a0832aa99417486) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* doc: Fix all paths in the qt_attribution.json filesDominik Holland2023-01-112-4/+4
| | | | | | | | | | Some of the files have been moved, but the attribution files were still pointing to the old location. Change-Id: I6c53e90802775bdad055f3dcf66f4c8124b708e7 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit e7636163a3937847c130428fe8540250b8ed5d59) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix deploy-virtualenv.bat to handle new python versionsDominik Holland2023-01-111-2/+6
| | | | | | | | | | | | In newer python versions the dlls are not located in the Scripts folder. Without the dlls the created virtualenv is not fully relocatable. Also fixes some errors when the path contains some spaces. Change-Id: Iac9db12f411d39e9a6674bdc082da084ca8d0b35 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 8526131886e2d7e6853c8c2b95554dfbd3416010) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-091-4/+4
| | | | | Change-Id: I8d3bc52690bee2960360815f7ffdcc93d751f35e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-051-4/+4
| | | | | Change-Id: Ia0dde8bebb3341706d9c0e2e18554bcba25f4248 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.3Jani Heikkinen2023-01-021-1/+1
| | | | | Change-Id: I80e79a99f06c44f98c03f53d4335ff1851d21297 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2023-01-021-4/+4
| | | | | Change-Id: Ic5d89a9f82a5f0a902fb99c793f1f1b4eaffa62e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-12-291-4/+4
| | | | | Change-Id: I4440ce05215e1e7a5c1273a5c04935f19751416d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-12-211-4/+4
| | | | | Change-Id: I4a55480b82c9cdf602d721c96d7978f707e30357 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* qface-tutorial: Improve qml plugin codeDominik Holland2022-12-167-118/+12
| | | | | | | | | Also add the CLASS_NAME for static linking and IMPORTS statement for a QML dependency to qt_add_qml_module. Change-Id: Ia12600994b3046104bb1a7128f3ef7e34039543d Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 15f8311e5ed14eb5a435972941367af47d0d0112)
* ifcodegen: Add all headers to target_sources when building with CMakeDominik Holland2022-12-155-0/+9
| | | | | | | | | | This extends 3050a2a1e47325fb002386312ecc97c2c2e3222c to all other templates. Change-Id: Ibac0238ff789ec2bbe97e9b3e2763f77c3fb5566 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 92e28e634a85b5fb8ed89ff04f0f9a8a55f2eb1b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix IfVehicleFunctions to build with syncqt/cppAlexandru Croitor2022-12-141-0/+7
| | | | | | | | | | | | | | | The headers generated by ifcodegen were not passed via target_sources in the generated/included cmake file, so syncqt didn't know it was supposed to create forwarding headers. Adjust the frontend template to pass the header files to target_sources. Fixes: QTBUG-109355 Change-Id: I50e0eb1d8cff959ba05294650758772bddc244a3 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 3050a2a1e47325fb002386312ecc97c2c2e3222c) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix calling initialize() twice in QIfMediaDeviceDiscoveryModelDominik Holland2022-12-131-3/+0
| | | | | | | | | | | | | | This caused the signals to be emitted twice as well and calling resetModel() a second time. resetModel() deleted all elements although it didn't own them and this caused a crash when calling resetModel() again with a list of dangling pointers. Change-Id: Iad0455e10867235aae2478704acdcb53fbce1930 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 716c858a253e3abebc08a72b3426735f55ecd3e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QML type registration for some typesDominik Holland2022-12-133-1/+4
| | | | | | | | | | * QIfAbstractZonedFeature was registered with the wrong name * QIfAbstractFeatureListModel wasn't registered at all Change-Id: I0fed94fd2fcf1b1ef231d3a33991224db4f7aed4 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 02e60a9a9a2904470025701d92a97b228bb7da0f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* ifcodegen: Fix qmake integration when using a dirty virtualenvDominik Holland2022-12-131-2/+2
| | | | | | | | | | | | | During development it can happen that multiple python versions are used to create a virtualenv and installed over one another. This virtualenv has multiple site-packages folders and the qmake integration should still work, by just using the first one found. Change-Id: Iddc0a58875001f3ceb08aab9eae298eb8418f194 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 5ca0c1a5f97d0511cf6c3ad3152c5a7e93f17588) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix paths for Files property in qt_attribution.json filesKai Köhne2022-12-071-1/+1
| | | | | | | Change-Id: I10bba78ffce32be9495d2490e9aea991be3691fe Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit bbdf723ace753ccda30745ff8186a5156c42712a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix link to CMake Commands in Qt6 InterfaceFrameworkKai Köhne2022-12-061-1/+1
| | | | | | | | | Amends fea34864fd12f812728 Change-Id: I326c5b61a9379384e35793d9bd961795cc6c4bce Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit e3505594190822cfd133252a8e7e2be3ac737a2b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-12-011-4/+4
| | | | | Change-Id: I2b76322336d8620737d9b915c6f1638928b8e4ce Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-301-4/+4
| | | | | Change-Id: I43f69536a01ffe2de627e881a5d3c3691c25cc50 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-231-4/+4
| | | | | Change-Id: I540cf847780d7ab567e03dd885648d7566b28b99 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-221-4/+4
| | | | | Change-Id: I7881cda84629dd5e3b34e9a2c93c869f0f4d3dbe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-181-4/+4
| | | | | Change-Id: Id2e76d6b6bf2ad450b069b05c375ad9d5828033e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-141-4/+4
| | | | | Change-Id: I5bd727931cb4779ee5b277a886919d3b5f872b34 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.2Jani Heikkinen2022-11-121-1/+1
| | | | | Change-Id: Ibbf7cbedf1f40a41519ce3776dfd383cf1512fac Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-121-4/+4
| | | | | Change-Id: I06d2787bc115821011669109001fd01ffa31562a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-071-4/+4
| | | | | Change-Id: I4b312a660b7f31274ad0b40b7c5d83febf2a6385 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fully qualify all enums in the QIfServicerManagerDominik Holland2022-11-031-2/+2
| | | | | | | Change-Id: I60af6cfa2ce8cc8b74b34395be324052785b7247 Reviewed-by: Robert Griebl <robert.griebl@qt.io> (cherry picked from commit 613a3769a75906506ee3afef1bb5a26ee20e9f38) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add online sidebar to improve navigationTopi Reinio2022-11-032-1/+51
| | | | | | | Change-Id: I3c7515c0082308727ec21880e0695db0fbb6fe8d Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 578d5b3881ba2e26e9fce29738eabf211abd4dd5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add overview pages to CMake APIKai Köhne2022-11-023-8/+49
| | | | | | | | | | | | | | | | Provide a landing page for InterfaceFramework commands and variables, making it easier to navigate between them in the breadcrumb menu. Also, add details on where the respective command is found. Finally, for variables, normalize the .html name (this is done otherwise by qdoc). Task-number: QTBUG-96239 Change-Id: I06411168f6bd0959a4a5a54ebf435718a167656a Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit fea34864fd12f81272824790d8960c21c1c2597b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Show CMake command/variable summary also in page itselfKai Köhne2022-11-022-6/+6
| | | | | | | | | | \summary macro in qbase makes sure that the sentence is both shown in the overview (\brief), but also in the actual page. Change-Id: Ie7b7c3e092db483af67a132b09bfd1ba76465974 Reviewed-by: Dominik Holland <dominik.holland@qt.io> (cherry picked from commit 1be5acc3ec6e51b7ddb88368eadb464412a9a378) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-11-011-4/+4
| | | | | Change-Id: Ia58055585f2d357678428e64a442f9617f8e68f0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-10-271-4/+4
| | | | | Change-Id: Ic79cbe5dd983e84c6ea6d7b1cc17a4dadd43bb48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-10-261-4/+4
| | | | | Change-Id: I2d409e83d71cde1cb3c7667489a011a78d883ff3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtinterfaceframeworkQt Submodule Update Bot2022-10-201-4/+4
| | | | | Change-Id: I0411acf1a1d95e4eb70eba7b1d6ed617a834618b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* ifcodegen: Improvements on python cache handling and error reportingDominik Holland2022-10-191-2/+6
| | | | | | | | | | | | | | | | | | | Make sure to call python using the -B flag. This makes sure new byte code is NOT written into a __pycache__ folder next to the python file. This keeps the git repository clean from unwanted files and help in case of errors introduced from that cache at the cost of slight performance degradation. Reporting ifcodegen errors using FATAL_ERROR does add additional newlines and doesn't allow the command to be copied easily. To fix that, the command and error log is now reported as a normal cmake message and building is stopped with a FATAL_ERROR afterwards. Change-Id: I9f300959fa47a8d895f224beb0645fc32f5179b5 Reviewed-by: Robert Griebl <robert.griebl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 53046880468d0f1fdc899f24d12c9e3240f3f2de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 05:56:36 +0000