This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding rules to the licenseRule.json files
- correcting the licensing given via REUSE.toml files
A lot of files are skipped during the license test,
but all are present in the source SBOM.
This is why corrections are needed before turning the
source SBOM check on.
Task-number: QTBUG-131434
Pick-to: 6.9 6.8
Change-Id: I3a411c77c671d045b296cdacee1e90ec64307b6e
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
If the channel is in error state the socket could be non writable which
would result in an error loop if reconnections are steadily happening
since the logic would never reach m_reconnectFunction().
Add a safety check for the state to be Connected to protect against this
condition.
Pick-to: 6.9 6.8
Fixes: QTBUG-133937
Change-Id: Ie6c4858623ee8d7cc89a57d9bb14e4735fa64117
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Detect the situation where processOperation is called from within the
Q*Socket::errorOccurred, as it would be the case for immediate
reconnects.
The socket may not be ready for a immediate reconnect attempt and in
such a case the connectTo* function may return without signaling an
error. This would put the RPC in a dangling state, where its not able to
recover and no finished() signal will be emitted.
Solve this by adding a bool that we set during the
Q*Socket::errorOccurred and check during processOperation() calls and do
the asynchronous for our users. Print a warning to remind them about
this, as it's still preferred that users delay their reconnect attempts
on their own.
Ref: https://doc.qt.io/qt-6/qabstractsocket.html#errorOccurred
Pick-to: 6.9 6.8
Task-number: QTBUG-133937
Change-Id: Ic51f661ad576a24716f5790f5e6e2c96a19acbc4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
`git-review` is a command line tool for interacting with Gerrit.
Some IDEs offer support for this tool, either natively or through
plugins. The tool relies on a configuration file, .gitreview. Adding
this configuration file to our repositories simplifies initial setup
for contributors that use the tool directly or through their IDE of
choice.
The configuration file adds a remote called 'gerrit'. This is the
default for the tool, and also the name set for
codereview.qt-project.org by Qt's `init-repository` script. Thus,
the configuration should work seamlessly alongside other repository
helpers.
As the file format doesn't seem to be designed with comments in mind,
add it to the other version control system exemptions in REUSE.toml.
Task-number: QTBUG-132604
Pick-to: 6.9 6.8
Change-Id: I5b3fd33b6c43d28c9268ad2cc3f43214d812d8c7
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Server and client request/responce time format differs, since
std::chrono::time_point::time_since_epoch() output contains
undeterminated units. Make the explicit conversion to milliseconds,
to align the time format between server and client.
Pick-to: 6.8 6.9
Change-Id: I5914221d3b3b8043721f4d97705ccb54c679be9c
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
The previous chat example was created many moons ago and much has
happened since then. These are the key improvements for the new qtchat:
- Server uses the Callback API
- Added support for Registering (stored in plain text on server side)
- Use long-lived bidirectional streaming for the ChatRoom method
- Any files can now be shared in any size with all chat users
- Use the Grpc client from a dedicated worker thread to have lag-free
UIs
- Use the generated protobuf QML-library declaratively in the app
- stylistic improvements
- Use SSL for safe communication
- Automatic reconnections
This is an advanced example showcasing many features of this module.
Pick-to: 6.9 6.8
Fixes: QTBUG-121871
Fixes: QTBUG-122625
Change-Id: I71114375fe91ffb20a235859b6ab51f7b3ab07a3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This was missing before and is a crucial information.
Pick-to: 6.9 6.8
Change-Id: I16c99c4d6482a0b94a9a39af360638ec438873e6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
It worked previously since Qt::Quick->Qt::Qml linking propagated
it as private interface.
Change-Id: I2a28483e0baae728a6bbbf18df2c27a57230054a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
If user doesn't specify the scheme or uses the unsupported one
fall back to the default one for the selected communication method.
Pick-to: 6.8 6.9
Change-Id: Ibe33cda464d4ef161c69d4f16862e543603b943e
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
QDoc now warns about C++ types in QML property documentation.
This change fixes existing documentation to prevent warnings.
Pick-to: 6.8 6.9
Change-Id: I293360f775cb3fd3472f57c73bc8f066f15b9fce
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
The :authority HTTP/2 header should contain the compatible ASCII
characters only. We should ensure that UTF-8 URIs are properly encoded.
Pick-to: 6.8 6.9
Change-Id: I2f18480e55ad86e32cfd190e198e73d14feba467
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
find_package with NAMES argument forces the CONFIG mode look up.
We accidentally looked for Protobuf uppercase in MODULE mode in
configure.cmake which allowed Protobuf targets be found for tests
and tools. Make this double lookup procedure explicit. All efforts
to support ubuntu/debian platforms, that decline to deliver protobuf
Config files.
Drive-by, use the correct variable to check that Protobuf is found
in golang grpc test server.
Pick-to: 6.9
Change-Id: I50d17aec72540a472bff30782d83e4555c51604a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
It's not mutable during QGrpcHttp2ChannelPrivate lifetime, so we
may cache it.
Pick-to: 6.8 6.9
Change-Id: I2b84a4ec46acfca488d00d527e180a6e3fc430f1
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
QByteArrayView doesn't have any pros comparing to the cref. But causes
the deep copy each time we create HTTP/2 headers.
Pick-to: 6.8 6.9
Change-Id: Iddb44912c2eafa555e9dd2a19eae503a34be535b
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
- add rvalue tests for message types, repeated and map types, oneof,
other non-trivially copyable types(QString QByteArray and QDatetime)
Note, skipping optional, since it is already implemented in
void QtProtobufOptionalTest::move().
Task-number: QTBUG-128388
Change-Id: If36d05de659181c547a836aeb84d5f9da38709bd
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
As it's defined as [[nodiscard]].
Pick-to: 6.8 6.9
Change-Id: I849922ed7bd64a4f67e6da0e11b1d6b4ad38deb7
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
According to RFC :authority header should include host name and
port if it's not the default one. In current implementation we
ignore this requirement, which is incorrect. Also we cannot use
QUrl::authority, since RFC explicitly states:
The authority MUST NOT include the deprecated userinfo
subcomponent for http or https schemed URIs.
https://www.rfc-editor.org/rfc/rfc7540.html#section-8.1.2.3
Pick-to: 6.8 6.9
Change-Id: I69428f7c013a44a47f36443a82819233e4cb852e
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
It's not necessary that the server executable is located and named
always the same. We may try to hijack this using various CMake
OUTPUT tricks, but it's easier to utilize the actual file path in
the client executable using definition.
Amends dedd3edd3f
Pick-to: 6.8 6.9
Task-number: QTBUG-125406
Change-Id: Ice60e22caa6c5c14024f57fe133f2268ad96f574
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
We should aim to have the attributions as close as possible to the
actual sources. The old 'combined' attribution also did mix up the
in-source copy of some protobuf files, compared to the dependency
that is provided by provisioning.
This also fixes an issue in our documentation infrastructure, where
we remove tests/ directory before building the Qt Framework
attributions. This generated a warning so far:
File ./qtgrpc/qt_attribution.json: Directory '/home/vagrant/qt-everywhere-src-6.8.1/qtgrpc/tests/auto/protobuf/conformance/data' does not exist.
Pick-to: 6.8 6.9
Change-Id: I26c8483737ab6a6e863b3ee4a683c77cb9af5c0a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
If preparsing of the .proto schemes doesn't detect the definitions
that can be processed by our generators, make the early return
from qt6_add_<protobuf|grpc> with the respective warning message.
We require that provided .proto files contain either message/enum
for protobuf generator or services for the grpc generator.
The warning can be suppressed by setting the
QT_SKIP_PROTOBUF_MISSING_DEFINITIONS_WARNING variable to TRUE.
[ChangeLog][CMake] The qt6_add_protobuf and qt6_add_grpc functions
do not generate CMake targets if provided in PROTO_FILES argument
protobuf schemes do not contain the corresponding for the generator
definitions. qtprotobufgen requires messages or enums, qtgrpcgen
requires services. Functions now make early return and warn about the
missing definitions. Previosly the functions generated unclear
FATAL_ERROR. The QT_SKIP_PROTOBUF_MISSING_DEFINITIONS_WARNING CMake
variable suppresses the warning.
Pick-to: 6.8 6.9
Fixes: QTBUG-132848
Change-Id: I620c2b5bab719a61510c5cbc2ae8224e3df70fcf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
The Null value is acceptable value for JSON fields. We should
use QJson::Type::Undefined as the default value when we want
invalidate the QJsonValue or point to its emptiness.
Pick-to: 6.8 6.9
Change-Id: Id590013aeafe9cce26aec873ddabb66ad3f6542c
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Use shorter protobuf registration file name.
Rename '_protobuftyperegistrations' suffix to '_qtprotoreg'. It helps
to bypass windows long path issues.
Pick-to: 6.8 6.9
Change-Id: Ide40ad2942135c08a06097269ef2f2a4718b1e09
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Shorten the name of the internal protobuf registration targets, so
it help to bypass the wellknown windows long paths issue.
Rename the target suffix from '_protobuf_registration' to
'_qtprotoreg'.
Pick-to: 6.8 6.9
Change-Id: I138265f51fb4c02e3199c7b1cd11794a65868053
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
The feature guards the private code paths that enable or disable
the safe registering of the custom protobuf serializers.
The feature is useful when user want to trade the thread safety for
performance.
From the code perspective feature disables read/write locks when
accessing custom protobuf serializers registered privately.
Change-Id: I07cb622481a798e7aeba9c7afb29593e791e065e
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Consider that some well-known repeated types should be encoded as
atomic JSON types in array too.
Task-number: QTBUG-120214
Pick-to: 6.8 6.9
Change-Id: I57d98bb8584183f98882db64ab5612315887397d
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Consider that well-known repeated Value types may be encoded as
atomic JSON types in array too.
Task-number: QTBUG-120214
Pick-to: 6.8 6.9
Change-Id: I9fa332571728089788ed5acc5f0b62fc9ec6f306
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Add the support for the optional deserializers of the well-known
Value types.
Generalize the approach so Timestamp, Duration, and BoolValue have
the common implementation.
Task-number: QTBUG-120214
Pick-to: 6.8 6.9
Change-Id: I0e835e6f0be3e45b525b310e2fb38dfec60911f3
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Validate the integer values that are packed to string when
deserializing numbers from JSON.
Task-number: QTBUG-120214
Pick-to: 6.8 6.9
Change-Id: I6324caa0e3c75cb96c89a523db478229d59958fe
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Amends 00a86d9d2c.
qprotobufwellknowntypesjsonserializers.cpp:37:69: error: incomplete type
‘QTimeZone’ used in nested name specifier
Change-Id: Ie6dbe21b4790239c8379fffdb5ccf0743f7f3e00
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Fixes the following documentation warnings:
src/protobuf/doc/src/qtprotobuf.qdoc:438: (qdoc) warning: Can't link to 'Text'
src/protobuf/doc/src/qtprotobuf.qdoc:438: (qdoc) warning: Can't link to 'Item'
Pick-to: 6.9 6.8
Task-number: QTBUG-132954
Change-Id: I35afd0b744e8c9ea81d1c70353d08fd3bf0b857b
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This reverts commit ec8afcaca5.
Explicitly enabling the warning limit causes situations
where the entire top-level documentation build fails when
a submodule documentation has warnings.
Let the CI documentation testing step enable the warning limit
instead.
Pick-to: 6.9 6.8
Fixes: QTBUG-132954
Change-Id: I8969e54073a34c3cde7059d5d5d736bfe4e509f7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
If QT_NO_CREATE_TARGETS is set to true, that means we should avoid
setting any properties on Protobuf targets, otherwise these targets
either do not exists or can be aliases from Qt build tree. If the
second the respective properties should be already set.
Pick-to: 6.8 6.9
Change-Id: I96855d457ea044a75ae3a726753e245559c9d2aa
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
In non-prefix builds .proto files land in the module build directory,
but should be copied to the proper include directory of the module.
Use the build interface include directory if QT_WILL_INSTALL is FALSE.
Pick-to: 6.8 6.9
Fixes: QTBUG-132907
Change-Id: I0405b6fd25177bb7b8a8b0c25b5fd757fcebdab8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Ensure that we consider the deprecated Protobuf module version
variable when detecting protoc. Sensitive for the debian like Linux
destributions.
Pick-to: 6.9
Change-Id: I48d32c02af0d2c91e9fd2fed2a913464d585031c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
- add an instruction how to handle contradictions of Protobuf types
and QML types in qml-files.
Task-number: QTBUG-132125
Change-Id: Icf5338cd35e8024872d8df90d830416357c13024
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Add custom JSON serializer for google.protobuf.Duration.
The serializer should serializer the number to the following
format: '<seconds>.<nanos>s' by default. Deserializer meanwhile
supports both object and short string JSON representations.
Add the respective tests.
As driven-by change replace qWarning with the proper QtProtobuf
module specific qProtoWarning in the
(de)serializeProtobufWellKnownTimestamp functions.
Task-number: QTBUG-120214
Pick-to: 6.8 6.9
Change-Id: I328c647a2e1de53d6ee9d94e655f953b53aef03f
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Change the way we handle them. Add the special registry so any
type can register its special JSON (de)serializer independently.
Move the timestamp serializer from the generic JSON serializer
implementation to QtProtobufWellknownTypes library so we remove
the weak backward link from QtProtobuf module to its dependency.
The introduced mechanism is also scalable, and allows adding other
types that have similar special JSON serialization.
Task-number: QTBUG-130555
Task-number: QTBUG-120214
Change-Id: I56ce2e43a00262069281871d5f903f1e94abef83
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Sever uses WrapProtoc target to generate the reference protobuf and
grpc code.
Add the missing package lookup.
Amends dedd3edd3f
Pick-to: 6.8 6.9
Task-number: QTBUG-125406
Change-Id: I3cc93443170dcddfada3ddff266b958e86a2d460
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
The call is mandatory for all CMakeLists.txt.
Amends dedd3edd3f
Pick-to: 6.8 6.9
Task-number: QTBUG-125406
Change-Id: Ib39843424c9215d809fe4380c1c80b8c87ac7e05
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
The qt_autogen_tools_initial_setup was called with the wrong target.
Pick-to: 6.8 6.9
Change-Id: Ied10a04745a75d5894fc8f04243e75f04c0c8390
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Added a note to use Manifest mode over a classic mode as a recommendation.
Fixes: QTBUG-131689
Pick-to: 6.8 6.9
Change-Id: If8fe00f187bfd70e5a9e03f0bdd38f1a1f6dcfb0
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
- qt-add-protobuf and qt-add-grpc APIs take "QML" as a parameter,
which requires ProtobufQuick and GrpcQuick supplied to find_package
call, but it's not mentioned in documentation.
Pick-to: 6.8 6.9
Task-number: QTBUG-131780
Change-Id: I26c24e0c2695587056e46782cb4bb36438c46313
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Qt Submodule Update Bot
Lucie Gérard
Dennis Oberst
Paul Wicking
Alexey Edelev
Topi Reinio
Tatiana Borisova
Kai Köhne
Thiago Macieira
Jaishree Vyas