| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I724515f562a763530b54b7fe0c090948f8c0a3e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ic0888caf29b6e1d3361ce31089d44dd13be3ac25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I39acfe417a9b5d14bac892f5933f53202a60b9ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I2cf20a5c898d2e04dddeffaec96c280853462c45
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: If6ef7a4a696b23739d6567d3a09fbb30b6bdd38f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I22628b1965e5f4168bdec39ff057bf72d0bfa2bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I0b7017daed24042625b14086f41cacb8afd25abb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We want to match the commit ID along with the
RREV (recipe revision). This way we can pin exact Conan packages
to known sha1/tag which makes releasing easier.
https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode
We have two use cases where the conan export is being executed:
- Conan export from src tar ball
- .git directory is not present
- Coin/CI: conan export from git repository
The "scm" feature will not work if the ".git" repository does not
exist. If this is the case then use the default "hash" mode for the
recipe revision.
Task-number: QTQAINFRA-4325
Change-Id: I540ae0aa493e0568d851e5788bd2f76ff5417d50
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit b1cbeaf43d56248da541d542f62ef8e494a012be)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ie699d8f4696a1f3fab65140d6001145deff27c10
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I9705b7bd1057d92ee6fa975caa819d876efe0854
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I83d014ab22cb00a65185434999747e0d4641143e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I08ea217f8e368a1c0142a964387a4d9f64b2727a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I80c9603b91d50d663fd61a9ecf705048c97dbbfc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I35b28e4578b3eb5fea4be663eea53d13f2012a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: Ia2a5c45f161f277b1c6086a5498f5d3255f388fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: I9f90acc529e78288ceb8ea52e23629d2c125f705
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We will add additional libraries back to the qt5.git. Having
documentation build enabled in additional library will cause problems
in qt5.git integrations so we need to drop it from module builds.
At same time drop the qttools dependency which were added for
documentation build
Task-number: QTBUG-91796
Pick-to: dev
Change-Id: Idcb782ceffb757389255024ae5ef5a668d980ffa
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
|
|
|
|
| |
Change-Id: Ifbb1cccae24003b523cd60a05ec05095d3a8d881
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: Icf51710540069a55bf71348112273d6b8011f9e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I016247d7ae5acf8e72e761a7df2b376e2b6c1f50
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I9ef305a1e017f88c6d573a561fe2b991bd2f8c02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: Ib0c95699a425ef532d9b81f5441e62222ffe4545
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I0f2fabfe41368c0cc86f12e732796d35a7ccdd4f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: If3e49471807d4706417a5987f9afb71fae615657
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I3d5796f1e5bd55f58167342ac4be0b92355b36bf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I413c920c85aea8173fde0ada189326c45c04cdcd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Default to the value of the prebuilt Qt build.
The 'default' needs to be added as valid option in the list which
will be used by default if no value is given by the user or via
the conan profile.
The user is still able to override this via the profile or from
command line if needed:
"conan install ... -o shared=False"
CMakeCache.txt:
- "conan install ..."
- BUILD_SHARED_LIBS:BOOL=ON
- "conan install ... -o shared=True"
- BUILD_SHARED_LIBS:BOOL=ON
- "conan install ... -o shared=False"
- BUILD_SHARED_LIBS:BOOL=OFF
Task-number: QTBUG-90901
Change-Id: I6715670a87dd15119b1e89394bd49debdbb6dda8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7f387ede31cb3b770014938be49f472692570c04)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's an established environment variable for this though, QTDIR.
This environment variable is also set by Qt Creator by default.
So the Conan recipes should accept this environment variable instead.
This requires a change in the matching conan profile files
where the path to Qt installation is injected to env.
Task-number: QTBUG-90583
Change-Id: I5b8bf2483a46eb2c9a0a68314c92e82206f2c2ad
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
|
|
|
| |
Change-Id: I51e1966ea3eec1704464f10d6eb870845f994012
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I76954c97126869e683f40e52ace5e1869b999171
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Support building with Conan against Qt6 base binary package.
The build recipe expects to locate QT_PATH from env.
The 'qt-cmake(.bat)' is used for the build.
'CMAKE_TOOLCHAIN_FILE' is used to pick the toolchain
file for cross compilations.
For Android builds 'ANDROID_SDK_ROOT' and
'ANDROID_NDK_ROOT' need to be passed from env.
Change-Id: Ie035ae33afeac92bc60fb6fa5dc083766182385d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 8da1f5aa6b6914d7c737538708b312cd4b952dc7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
CMake edition.
Task-number: QTQAINFRA-4126
Change-Id: I27a1c40c62bce24c06dbdf6efc5ab79e11c5c081
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|
|
|
|
| |
Change-Id: I5a25cca686a5e8553a9a8db686e55cfca0bfcc83
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
|
| |
The Qttools is required for the QDoc for building the docs.
Change-Id: I1312673a686e12cf4d65d9ad4d40ad2f947cbfd4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3ed510028391bbb16f7a9b4ff5aa658e5d2a3c4f)
|
|
|
|
|
| |
Change-Id: I8d38a6f4b0fde18232bcf2c98d49dca6118f95e7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I94e71e50e55a75164fa9e42f9176e8f37c866ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In certain scenarios, it is important to distinguish errors occurred
within particular states.
A common example is: if network error occurred for a connected
and operational client, one could try to reconnect and restore
previous MQTT session using the same clientId and cleanSession=false,
without having to bother the user if that succeуded;
however if network error occurred during connection to MQTT broker,
the behavior is completely different.
Change-Id: Id1e90b7916f3e2ab32320518d0da1100014e5dd1
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
| |
|
|
|
|
|
| |
Change-Id: I7eb1fd250e040124a89145dfb37a350aa98773d3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Update Qt 6.0 Beta5 SHA1s
Change-Id: I02a3337b9aadc593801e0b6b716ebe8413e9bcb1
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I0164e4e56cb477df8d05156676a781a71fc45b10
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 91d59b6e103cb5b910d310cb32938a7e9235dddb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Id115fbbfb691cac1522d188ac3961a48caaf9fc1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit cade213f562049400da81e60762400df68d7c56b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
| |
Change-Id: I4eed33497c9d480e9b72a66216ed0ad94b505ffc
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also, remove optional dependency to websockets, which is not
part of Qt 6.0 and fix compile error against unsigned comparison.
Switch default test configuration to not launch TLS brokers.
Latest COIN updates causes paho to fail in the SSL setup.
Task-number: QTBUG-88189
Change-Id: I9d31f9e54801d269122878ab4cf7541512fdbe98
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
|
|
|
|
|
| |
Change-Id: I8bbe275d61a616a5fb88d1a9cc8d922015ce3832
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: I669e04ba3da47b9e23fa3ec482a6cb29e25392cf
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
(cherry picked from commit 0da764d8fec459ee28b70f68028ada81ed31abf7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
when QMqttClient gets destroyed in Connected state, d->m_connection
in its destructor (indirectly called by ~QObject) sends DISCONNECT
Control packet and then closes connection, causing
transportConnectionClosed() to call m_clientPrivate->setStateAndError(),
which, in its turn, accesses [a partially destroyed] QMqttClient instance
Change-Id: I216f700d92838dc25e385fe2d449f3ad93a642e6
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|
|
|
|
|
|
|
| |
Required to also enable CMake CI configurations.
Change-Id: I20099cb8a1a41e210bff6a157e84ed718efb4396
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: Id8d2f39fabaec11babddf22cd7e77fb06048d2db
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-84319
Change-Id: I2184c8ba15f9e9671f9b8f404e6a5d5054bea3bb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|