| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ie8f4198b4a6e32e727ac3edf03ac8797d00574ca
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I719c8bcc9bf364fd322cc278d970a4c939a52977
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ib70ad9f94245d771a6703890ffe28215b9bc6b18
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I57ad26ba50f8f269a517f32d5d690884ac858c50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I064c04213e0f426bdad32494d83965e99894e52c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Icdb087f314d5ed3e02e0dd9eae94652b95a4da57
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Id3ed613fe3a13a545006a879baebba400a593091
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I46fc824d9d754a93bfb38153b9c1932be9b6dc16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I8962c09e990b707c08d3f73317048deb98bfc9d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I3edbd4a8b7354f033062f95eba2858ca26d8f8b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I4d2438b3c16ebde76106de9f9e047250c6992290
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I639051b8b3346fbbb32076117f03d3f33a5be036
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Icf3fe3cda8cf64cec4d1c1cf1543af24638b734f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit d0088967c3fd286e2cd7a5f6efd085899ca3525e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ibb20e3f90d1812c37b36b4e0d5c6e3e77419678a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I102e6c8f2fe5f87af60bf86da6123fda0b4f9376
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic9a33afb4478a71367bc398d86bd6cb61621b821
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-108640
Change-Id: I97d4ab1930db74ba8f5d2e76d3f4b56a592631de
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit dcd741f1c9488030c46ed788c2945f48bf620110)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I8db93d48211394f6861fa6c2ba9f19525c9a59c7
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit f3ed2d50f70228dbe1e0f25ac4fe17a6afe19798)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Exposes the serviceSettings as property of the backend to
the QML simulation
* Adds a way to set and change the connectionUrl for every backend
* If the connectionUrl changes the QtRO node will be reconnecting to the
new url
* Adds a setting to define the connectionTimeout
Task-number: QTBUG-99079
Change-Id: I277e304b31bed0073f559b79eec64cf47cf8260f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 9943e67b0ef73a2aad99ebd5068eed53082c9d6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* All feature classes use "qtifmedia" as default configurationId
* In addition to control the simulation using env variables settings
can now be passed as serviceSettings
* Adds a way to set and change the connectionUrl for every instance
within the qtifmedia_qtro backend.
* If the connectionUrl changes the QtRO node will be reconnecting to the
new url
* Adds a setting to define the connectionTimeout
Task-number: QTBUG-99079
Change-Id: Ie125ea33eaaa4f3d04e061bcf23857cafae78d39
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 3ed46564afbeae26023d998d89e7645dc0446a00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I27794a241bb72f2f05fdc4171f6d0be5a1380bd3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Change-Id: I66ab75d8cae3ae2f196f263824c6fe4c8417eab2
Fixes: QTBUG-110298
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 1b990cee7702a9199649669e10d611a57079aa5c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I96fc3921304589ad5ddadeac497aef1e60b193f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The executable generated by the test template used to call all interface
tests one by one. Android testrunner drives test results into output
files and gets attention of failures by examining those files. However,
these files are not appended, but rewritten by all successive tests
which caused broken tests going undetected if they are not in the last
pass.
The test template is modified in a way that all interface level tests
are called from a main test class. This way, all interfaces are tested
in one pass resulting in a single test output file while keeping all
test functionality intact.
Fixes: QAA-1611
Change-Id: I6574c0ba76e2330a3fef17a3fba8834515bb5c6a
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit daa30331913f088706f36b7985bae23b4bd69dac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
This ammends bb45241069ab11ef63333bc4e6f65ff0dd8d9fee and
renames all pro files accordingly.
Change-Id: Ib369333b12e46224b845b5222f3ff936d72bc58d
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit b812f213bfa27b5ac77f5ecdc737b29e549ab17f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Support for 5.6 ended 2019-03-16.
And this is the Qt 6 code, anyway.
Change-Id: I3ee8e944c5db2211470f8344c498d1a3f9c50015
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit caa8069e99d17d3110c20ac91c4e36c00e167316)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I2606d1168dbd0061118e5e05fb44d22dcfac248c
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit 95d1fbe9b7194ce90918bdeca2bff0ddbeed0e6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I8a41a0d024d715fee895f09a938c59c10c33826d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0f46b37cde1f339424378a056e985cc29a13af24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0d7a0e50dfd663f229d1e95c38631a841c5f4713
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I3f34a16bfdb652357fd8b57ab9199022b55f0446
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0af62495e057c16257e754d7c102cdee18a09e9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0e8af42b56881e0634f8f22c4c70b81d7dcd30f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I6bbd279d3e4471e1d52784c936caf51f0f9c760b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I8c85049d2e0153974fe55f7a931f717bf0150667
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I66358acea188a23bd12e75bf2e4ea887c739fae2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ibdf463d8f6dc04b429ce735422a18703c26ecfaa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
* 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>
|
|
|
|
|
| |
Change-Id: I718dcac4078929eec13b475419bc6da01966e2c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I4b0eac10dfdb407af0951d9b7a2373d9fe4619ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|