| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Id123d8acb25514d25f8b480274f15c67c1c73492
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Let Chromium decide which ANGLE backend to use by keeping "default"
setting. The "gl" backend is available since
75b0d12f6 Add "default" and "gl" ANGLE implementation support to Ozone
Reportedly, the "gl-egl" backend doesn't work properly with certain GPU
drivers under X11.
Task-number: QTBUG-135786
Pick-to: 6.8 6.9
Change-Id: I1592e3c480059b0cd17831ba375ff709f00791cc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With cmake 4.0 changes, we can no longer expect CMAKE_OSX_SYSROOT
to be set:
https://cmake.org/cmake/help/latest/release/4.0.html#other-changes
Therefore make the setting optional for gn, as it should not be
required on "modern macOS".
Pick-to: 6.9 6.8
Task-number: QTBUG-135621
Change-Id: I48ed72d6e920fec4c395eb04c8a18619e045c1b4
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
When deployed on linux qwebengineprocess ends in libexec and
needs qt.conf otherwise qt libraries prefix render process is unknown
and running the process will fail.
Pick-to: 6.9 6.8
Change-Id: If44d4689d11eb8a9f25e2aee28ddef73861575ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
Make simplebrowser deployable.
Pick-to: 6.9
Change-Id: I4717c30d1048c0c76306a71c657499b997a146c4
Reviewed-by: Moss Heim <moss.heim@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Define CMAKE_VERBOSE_MAKEFILE also affects ninja generator
by adding -v if called through cmake interface ie.
'cmake --build .'
https://github.com/Kitware/CMake/commit/ce935ebe50926bde199d86fbde4a78974a4043f9
Use the value of CMAKE_VERBOSE_MAKEFILE to determine if
gn or chromium part must be built verbosely, in which case
append -v to the invocation of ninja.
Unify ninja flags setup for gn and chromium part compile calls,
so now NINJAFLAGS environment variable applies when building
gn itself.
Note this change has side effect compared to cmake patch
meaning the verbose mode is applied also when calling ninja directly.
Done-With: Fab Stz <fabstz-it@yahoo.fr>
Pick-to: 6.9 6.8
Fixes: QTBUG-124007
Change-Id: Id30ffc45ffa8ea4b7995d13905c855cbb4bf6407
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As unofficial builds do not use scrambled message ids
for mojo messages, this causes ipc errors, if
we run in debug mode. Therefore for debug builds
be explicit and do not use scrambled messages, unlike
for any other type.
As shipping debug resources (without scrambled messages)
increases overall installation size by less then 3MB,
simply support creating debug resources with javsscript
files created without scrambling messages.
Initial idea to keep the resource files in sync with
qWebEngineProcessd use case (so for only multi config
generator with CMAKE_DEBUG_POSTFIX) did not look good.
Therefore, keep things aligned with how we handle v8 sanpshot
context files for debug, add "debug" postfix to affected
resource files if config is debug.
Fixes: QTBUG-131897
Pick-to: 6.9 6.8
Change-Id: I34fa4b4842db521c782af4f4f61212c8cf04ddae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Submodule src/3rdparty 45d204bc..3e23b0d5:
* [Backport] CVE-2025-4052: Inappropriate implementation in DevTools
* [Backport] CVE-2025-4051: Insufficient data validation in DevTools
* [Backport] Security bug 403364367
* [Backport] Security bugs 398049412 and 403696324
* [Backport] CVE-2025-4096: Heap buffer overflow in HTML
* [gbm] Add fallback for drmPrimeHandleToFD()
Pick-to: 6.9
Task-number: QTBUG-136541
Change-Id: Id38026ccf429dabf577e7118e0df6b15c81db616
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
|
|
|
|
|
| |
Change-Id: Iba95faa8f9e4ec00d9cca2c7ae12e79413ddb166
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
The setting value was changed from screencastEnabled to
screencast-enabled. The value is updated to resolve the error.
Fixes: QTBUG-136533
Pick-to: 6.9
Change-Id: I5d469c91513f1f8b63c789d27c638249fec92240
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
| |
Change-Id: Ied4369bfc9bbaf78ae97835a4a76f2e4f46b8dff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
gbm_bo_get_modifier() may return invalid DRM format modifier for AMD
driver. In this case, create VkImage without DRM format modifier and
fallback tiling to VK_IMAGE_TILING_OPTIMAL instead of
VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT.
Pick-to: 6.8 6.9
Fixes: QTBUG-123607
Change-Id: Iacf4fc514ab42fa9ab712f5d9fde2d20000f599d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
| |
Change-Id: Ibdc665f09472ce6b45d706843ee1668632f2a19f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
| |
Change-Id: If832688d825622613a6df858b6960a9718907ba7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Submodule src/3rdparty 67ff901e..45d204bc:
* [backport] Fix build with Pipewire 1.4
* [Backport] Security bug 409243443
Pick-to: 6.9
Fixes: QTBUG-136167
Change-Id: I6aa170194b77e108623125e91662d2cfaee13ab3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Submodule src/3rdparty 006f192b..67ff901e:
* [backport] CVE-2025-3619
* [fixup] Reinstate jumbo-builds
Fixes: QTBUG-136038
Pick-to: 6.9
Change-Id: Ib11796842dbd86059a8388d8bcffa4fa352123eb
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the find_package() calls in the example CMakeLists only create
targets when the example is being built standalone, we still get
warnings when configuring the full module.
Without Svg support the example will look a bit broken, but this way
it is still possible to build without qtsvg and deploy for a system
which has svg rendering runtime.
Amends 50db3f69e CMake: silence warning configuring examples
Pick-to: 6.8 6.9
Change-Id: Ifc17f00e1ba7d29638296c823f2af005996a44c5
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Submodule src/3rdparty 6fe2eb1d..006f192b:
* [fixup] Add missing dependencies to avoid compilation errors
* [fixup] Update dependencies to avoid compilation errors
* [fixup] Reinstate jumbo-builds
* [Backport] CVE-2025-24855 Fix use-after-free of XPath context node
* [Backport] CVE-2024-55549: Fix UAF related to excluded namespaces
* [Backport] CVE-2025-3071: Inappropriate implementation in Navigations (2/2)
* [Backport] CVE-2025-3071: Inappropriate implementation in Navigations (1/2)
* [Backport] CVE-2025-3069: Inappropriate implementation in Extensions
* [Backport] Security bug 397187119
* [Backport] Security bug 396460489 (2/2)
* [Backport] Security bug 396460489 (1/2)
* [Backport] Security bug 399002829
* [Backport] CVE-2025-2783: Incorrect handle provided in unspecified circumstances in Mojo on Windows
Change-Id: I7c90d01ca11c988b1549959892e76f2cb37f3156
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Add a default constructor so that QMetaType can create it.
Task-number: QTBUG-108649
Task-number: QTBUG-135032
Pick-to: 6.9 6.8
Change-Id: I9390392f24f29cc16e0f36367a6a77e60a76b068
Reviewed-by: Kaloyan Chehlarski <kaloyan.chehlarski@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Add a default constructor so that QMetaType can create it.
Task-number: QTBUG-108649
Task-number: QTBUG-135032
Pick-to: 6.9 6.8
Change-Id: If82aa9e318f17ba5727b3bd6ad3684afb8b36c7f
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Allow a nullptr as the controller and add a public default ctor to allow
QMetaType to create it.
Task-number: QTBUG-108649
Task-number: QTBUG-135032
Pick-to: 6.9 6.8
Change-Id: I70dc626bb7cce1fdb96c4c3b4dabce2fdfc17537
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Allow a nullptr as the controller and add an "Ok" value to the enum to
signify "no error". This is in line with the "OK" value in Chromium's
net_errors.h. Furthermore, add a public default ctor to allow QMetaType
to create it.
Task-number: QTBUG-108649
Fixes: QTBUG-135032
Pick-to: 6.9 6.8
Change-Id: Id06db78f273805ba117eefaa0ada3eac2f538962
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT usage flag is not necessary because
the native VkImage imported into QSG seems to be only accessed via
sampling. VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT also seems to conflict
with the VK_IMAGE_LAYOUT_UNDEFINED initial layout with Nvidia driver.
VK_IMAGE_LAYOUT_UNDEFINED is a requirement for importing external
texture from Chromium.
Keep VK_IMAGE_USAGE_SAMPLE_BIT usage flag because it is a requirement
for sampling.
Remove the corressponding VK_IMAGE_LAYOUT_PRINITIALIZED initial layout
workaround for Nvidia. It is not necessary without the
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT flag and fixes validation layer
warning.
Also remove VK_IMAGE_USAGE_TRANSFER_DST_BIT and
VK_IMAGE_TRANSFER_SRC_BIT usage flags because those are not used and
seem to be leftover from an earlier implementation.
Pick-to: 6.8 6.9
Task-number: QTBUG-123607
Change-Id: If9dba4b6ff9d584e3d103ec8d05b7fe0cdaec339
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
List it on demand instead of in constructor. It is not used if
dma-buf/GBM/NativePixmap is disabled.
This fixes fatal error when glXChooseFBConfig() fails to return
configuration in XWayland with Nvidia driver.
Fixes: QTBUG-135647
Pick-to: 6.9
Change-Id: Iab10f6f0cdff54732a2dee8d201f1e3b14146b0e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Amends 83e85bebc Add more vendors to GPU detection
Fixes: QTBUG-126722
Pick-to: 6.8 6.9
Change-Id: Ie14c66d593e6ac8e1b55c377b73895397ef373ca
Reviewed-by: Moss Heim <moss.heim@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Following 07b89093604db618c15fe53bd04950922bb3469b this comparison
no longer compiles, and according to the commit message, it was never
meant to. This change fixes the one instance of it in our codebase,
inside the custom URL scheme handling.
Change-Id: I54bea24d42967145cdf209a6e15481bae7b3c6a3
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
INSTALL_DATADIR and INSTALL_ARCHDATADIR have the value "." by default.
CMP0177 in CMake 3.31 now warns when paths that have "." as a
component are passed to install().
To avoid the warning, pass each component of the path separately to
qt_path_join, so that it can properly filter out ".".
This change will have only have an effect once a newer qtbase is
brought in with the updated qt_path_join behavior.
Pick-to: 6.9
Change-Id: Ic8b5e7a1dfe92a16dd7fe69dfddd4141dd648e48
Reviewed-by: Moss Heim <moss.heim@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
addCopyCommand uses add_custom_target(POST_BUILD) which does not
accept the DEPENDS argument. This was causing the following warning
with CMake 3.31:
CMake Warning (dev) at cmake/Functions.cmake:469 (add_custom_command):
The following keywords are not supported when using
add_custom_command(TARGET): DEPENDS.
Policy CMP0175 is not set: add_custom_command() rejects invalid
arguments.
Run "cmake --help-policy CMP0175" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
Call Stack (most recent call first):
src/core/api/CMakeLists.txt:241 (addCopyCommand)
Stop passing the DEPENDS option.
Pick-to: 6.8 6.9
Change-Id: If58c3fa12f484b1ddf3136c79756f917bb8cfec3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the deployed lib dir is different from the Qt configured one (e.g.
lib64 vs lib), __QT_DEPLOY_MUST_ADJUST_PLUGINS_RPATH will be set to
true.
In that case we need to adjust the rpath of the WebEngineProcess
binary to point to the new lib dir.
Amends 73d58b489e8f4f900042f0ab6c1104e6431752e1
Pick-to: 6.8 6.9
Fixes: QTBUG-135620
Task-number: QTBUG-109553
Task-number: QTBUG-119077
Change-Id: Ic8b730386f4ab7d77da7e1ffb44d8482bd150209
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If DESTDIR is set, the install destination for all files should be
$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX} by default. And that is the
actual default value for QT_DEPLOY_PREFIX.
The problem is that file(INSTALL) always prepends $ENV{DESTDIR} to the
install destination, which when used with QT_DEPLOY_PREFIX results in
DESTDIR being prepended twice to a path.
Change the code to use CMAKE_INSTALL_PREFIX for file(INSTALL)
commands and QT_DEPLOY_PREFIX for other commands.
This was discovered while trying to create an installer for a deployed
WebEngine application using CPack, which always sets a DESTDIR.
Amends 73d58b489e8f4f900042f0ab6c1104e6431752e1
Pick-to: 6.8 6.9
Fixes: QTBUG-135620
Task-number: QTBUG-109553
Task-number: QTBUG-119077
Change-Id: I5860c58454d6a204b36b2185b76b6f974e88f652
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes the following warning:
CMake Warning (dev) at cmake/QtModuleHelpers.cmake:1187 (message):
Module WebEngineQuickDelegatesQml does not have private headers.
Please add NO_PRIVATE_MODULE to its creation flags.
Call Stack (most recent call first):
cmake/QtScopeFinalizerHelpers.cmake:24:EVAL:1 (qt_finalize_module)
src/webenginequick/ui/CMakeLists.txt:DEFERRED
Change-Id: I936bba73933775f11946778799047045fc037d3b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Starting with CMake 3.31, the following warning is shown if the data
stamp option is passed an empty string:
CMake Warning (dev) at cmake/Functions.cmake:332
(cmake_parse_arguments):
The NINJA_DATA_STAMP keyword was followed by an empty string or no
value at all. Policy CMP0174 is not set, so cmake_parse_arguments()
will unset the arg_NINJA_DATA_STAMP variable rather than setting it
to an empty string.
Call Stack (most recent call first):
src/core/CMakeLists.txt:615 (add_gn_build_artifacts_to_target)
Only pass the option if it has a value.
Pick-to: 6.8 6.9
Change-Id: I19a38b2eb05ab902e4c176f36b2410f62c403d32
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Submodule src/3rdparty ad5f2656..6fe2eb1d
* Disable devtools frontend unit tests
* Avoid crash due to long dictionary commands
* [fixup] Stop Chromium from using DirectComposition
* Qt GN integration
* Allow MAP_DROPPABLE memory mappings in Linux sandbox
Fixes: QTBUG-134481
Change-Id: I1ecf49c1a762d8a7f7c67ad45176aa4b8733c552
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently there is no easy way to check if compiler supports udot
assembly instructions.
According to arm specs:
-mcpu=cortex-a55
-march=armv8.4-a
-march=armv8.2-a+dotprod
should compile udot instructions and it does with for example
debian arm cross compiler gcc-12
However default setting "-march=armv8-a+dotprod+i8mm" in libyuv fails
with compiler above.
Add simply a test if dot assembly is supported with current
cmake flags.
Pick-to: 6.9
Task-number: QTBUG-134064
Change-Id: I35a5a4dff2c205c71b4acff123c8edc4b51a49e1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Correct the duplicated word "of" in the comment from "tree of of links" to
"tree of links". This typo could lead to confusion when reading the
documentation.
Pick-to: 6.9
Change-Id: Id19d02b1f2d52aa2b51f4d909ee73d57f26fb401
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When configuring qtwebengine as its own module, Svg is not searched as
an optional component, leading to the warning in
examples/pdf/CMakeLists.txt always being printed even when QtSvg is
available.
Add Svg as an optional package in find_package and move the checks
into the individual examples so the warning will also appear when the
individual example is built.
Pick-to: 6.8 6.9
Change-Id: I387dfd70ae1abc1a70f28dbfe74ac45b75bdf387
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
| |
Change-Id: I95817708ed8e6a283b2874370e9e0fdc1dd00b42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Remove an unused member, dynamically populate the policy combo box so
its items and data stay synced, fix a documentation typo, and simplify a
few expressions.
Pick-to: 6.8 6.9
Change-Id: I37997fbbeca51ed4c71c83a86d989917ce92b3df
Reviewed-by: Anu Aliyas <anu.aliyas@qt.io>
|
|
|
|
|
| |
Change-Id: I030dc1a380c5e5aa6e7181725f2b352c5b5ef027
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
TestInputContext relies on focus object. Wait for the focus object to be
set before trying to record input.
Pick-to: 6.8 6.9
Fixes: QTBUG-128440
Change-Id: Idc4a985d0f7305d13a4cb18f69da542c5e0469bd
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
|
|
|
|
|
| |
Change-Id: Ia6d9752e30ea93ff099c6f07f2892c637799dd32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Do not mind undefined platforms.
Pick-to: 6.9
Change-Id: I39b079d6eb7e155bbd28793522a465f8b7d59294
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
|
|
|
|
| |
Instead of having code-duplicates use the function provided by QTest.
Task-number: QTBUG-132645
Change-Id: Ica3d4653ab76127f0a7f55014594a83f1c8ee87f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Moss Heim <moss.heim@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Currently webenginequick uses a window as popup, and the contents are
getting clipped with respect to the parent's boundary. To avoid this,
set the transient parent instead of the parent. This is based on
the documentation.
Fixes: QTBUG-132794
Change-Id: I527ae55d130bc122c903a39738ffea5cec29eb90
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The EGL_EXT_image_dma_buf_import display extension is not available for
non EGL display thus importing NativePixmap with EGL is not possible.
Make possible to import NativePixmap as X11 pixmap.
This makes
--webEngineArgs --use-gl=angle
--webEngineArgs --use-gl=angle --use-angle=default
--webEngineArgs --use-gl=angle --use-angle=gl
configurations work on Linux.
Pick-to: 6.8 6.9
Task-number: QTBUG-129769
Task-number: QTBUG-133570
Change-Id: Ic6a40de373c5fd27c62abc3effb2f3ddee9210a8
Reviewed-by: Moss Heim <moss.heim@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.8 6.9
Fixes: QTBUG-135047
Change-Id: I42b6387407551079241350661adadedf7d71a303
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
|
|
|
| |
We need to map the item not the scene
Task-number: QTBUG-135040
Pick-to: 6.9 6.8
Change-Id: I1fa2087f822d3fb7fcb431592c222c2e7ddb5e34
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.8 6.9
Change-Id: Ib3ff4394009364c673ef45e4244b65ed38e41379
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
This conflicts with a target named server in qtbase benchmarks. Give the
targets more unique names.
Pick-to: 6.8 6.9
Change-Id: I52d71e37c976ada5bf48813ecaf200923b07aef6
Reviewed-by: Anu Aliyas <anu.aliyas@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.
Task-number: QTBUG-132604
Pick-to: 6.9 6.8
Change-Id: Ib122816f9e73a19406b7227ec401f7cf0574b52e
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
|