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
Change-Id: Idfdfabdddeff304ec5d22b6d1e9675ac2fed2ee6
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 0f1163ba55)
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
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
Pick-to: 6.1
Task-number: QTQAINFRA-4325
Change-Id: I1a06cc002ca1da4f723c2b9d1ddfb7fb2e25fe34
Reviewed-by: Toni Saario <toni.saario@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
Pick-to: 6.1
Task-number: QTBUG-90901
Change-Id: I991516a804875475991e27c7265693b3a7adec5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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.
Pick-to: 6.1
Task-number: QTBUG-90583
Change-Id: I33e2ebc6b04f87027e039d0ae951179f5b2d5530
Reviewed-by: Antti Kokko <antti.kokko@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: I7068865a66a368c36485ca495629b3ca40b2053e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ee6e01e58b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The Qttools is required for the QDoc for building the docs.
Change-Id: I834d3c719b6436560b060eda70723904c5f0e6d3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit a2160c214f)
Due to recent changes, when calling any QList-modifying operations, the
previously saved iterators on the list may be invalidated. Use indexes
instead of iteratots when inserting into the list of QCoapOptions.
Fixes: QTBUG-88729
Change-Id: I73e9bb841594f0dab992fda37fed4ad29081ae7c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
As well as the MACOSX_BUNDLE properties as necessary.
Task-number: QTBUG-87664
Change-Id: Ib975f6c4fc6676a8a2abfa50dcc43a76efc7d369
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
The build failing after d7ccd8cb4565c8643b158891c9de3187c1586dc9 and
update dependencies.yaml.
Fixes: QTBUG-85896
Change-Id: I52e4dfea4edf0b96de3387f36168bbd18b1cf097
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
The tst_QCoapClient::socketError was failing because it was using the
old signal connection syntax and as a result a non-existing signal. Fixed
the connection syntax in other places as well.
Additionally fixed a few unrelated warnings.
Change-Id: Ie8ab95551d945d3991debfc628497515894d539e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
When sending POST and PUT requests via overloads taking QCoapRequest and
QByteArray data, the payload of the request will be overwritten by an empty
byte array, if no data has been passed when calling post()/put(). Do
not overwrite the payload of a QCoapRequest, if the data parameter is
empty.
Pick-to: 5.15
Change-Id: Iffa40b00ce841a5cebb09dcf59ea22a2a5f9df50
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
as per https://tools.ietf.org/html/rfc7252#section-3
Following the header, token, and options, if any, comes the optional
payload. If present and of non-zero length, it is prefixed by a
fixed, one-byte Payload Marker (0xFF), which indicates the end of
options and the start of the payload.
Change-Id: Ib3ce645970b8b78fa055a5807e12762220509427
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Jani Heikkinen
Iikka Eklund
Qt Submodule Update Bot
Paul Wicking
Sona Kurazyan
Toni Saario
Alexandru Croitor
Antti Kokko
Qt Forward Merge Bot
Konstantin Ritt