Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qt/qtbase
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev@{1day}
Choose a base ref
...
head repository: qt/qtbase
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref
  • 10 commits
  • 12 files changed
  • 6 contributors

Commits on May 14, 2025

  1. QSslCertificate: fix PatternSyntax enum value 

    Regexp was renamed to RegularExpression.

Amends 8131116.

This looks like a "dead" code path, QT_FEATURE_regularexpression is
most likely always enabled.

Pick-to: 6.9 6.8 6.5 5.15
Change-Id: I99af481bb41a197a0b7d00c750440a93d8e6a3fe
Reviewed-by: Ivan Solovev <[email protected]>
    Ahmad Samir committed May 14, 2025
    Configuration menu
    Copy the full SHA
    6952cfe View commit details
    Browse the repository at this point in the history

  2. qtlsbackend_openssl: use QFile::decodeName() 

    ... instead of reyling on the QByteArray to QString implicit conversion.

Pick-to: 6.9
Change-Id: Ia9e8026f2962009d9deac044e42b18f6333cfec1
Reviewed-by: Mårten Nordheim <[email protected]>
    Ahmad Samir committed May 14, 2025
    Configuration menu
    Copy the full SHA
    4a3e7bb View commit details
    Browse the repository at this point in the history

  3. qtlsbackend_openssl: optimize QDirListing usage 

    Internally QDirListing uses the name filters to create
QRegularExpression objects which are then used to do the matching. Here
we are looking for files that have ".pem" or ".crt" extensions, so basic
string matching should work the same and is inherently faster.

Pick-to: 6.9
Change-Id: Ib19b1eb8717b21c3b96a52e7036665c40fb24caf
Reviewed-by: Mårten Nordheim <[email protected]>
    Ahmad Samir committed May 14, 2025
    Configuration menu
    Copy the full SHA
    6dcf148 View commit details
    Browse the repository at this point in the history

  4. QSslCertificate: fromPath(): check the path arg isn't empty 

    `path` may contain wildcard glob patterns or regular expression ones,
so this method tries to get a path prefix without those special
characters, but that prefix could end up being empty, to counter
that, "." is used as a prefix. This led to iterating over the
current dir, which isn't the intended behavior. If the current dir
has many files, this could end up slowing things down (which is what
happens in the bug report).

Fix the issue by returning early if `path` is empty.

Amends 49f143e.

[ChangeLog][QtNetwork][QSslCertificate][Important Behavior Changes]
fromPath() no longer accepts an empty path, which would previously
result in searching the current directory.

Fixes: QTBUG-134419
Pick-to: 6.9 6.8 6.5
Change-Id: I29224c3a47794b4095db5feae32a964dd9b854ff
Reviewed-by: Mårten Nordheim <[email protected]>
Reviewed-by: Timur Pocheptsov <[email protected]>
    Ahmad Samir committed May 14, 2025
    Configuration menu
    Copy the full SHA
    2875c43 View commit details
    Browse the repository at this point in the history

  5. QSslCertificate: add fromFile() method 

    QSslCertificate::fromPath() does some extra work:
- matching wildcard glob or regular expression patterns
- checks if the string it's called on is a file or a dir

That extra work isn't needed when you already have the path to a
specific certificate file.
E.g. qtlsbackend_openssl.cpp:systemCaCertificates() used to call
fromPath() on *.pem/*.crt files that it got from iterating over system
certifcates dirs.

This also de-duplicates the code in fromPath().

[ChangeLog][QtNetwork][QSslCertificate] Added fromFile() method.

Change-Id: I92ab358e4711866dd4510da42c47905c7dae58b1
Reviewed-by: Ivan Solovev <[email protected]>
Reviewed-by: Mårten Nordheim <[email protected]>
    Ahmad Samir committed May 14, 2025
    Configuration menu
    Copy the full SHA
    2be51c6 View commit details
    Browse the repository at this point in the history

  6. CMake: Fix showing exit code when SBOM NTIA verification fails 

    The code was missing an escaped dollar sign.

Pick-to: 6.8 6.9
Task-number: QTBUG-122899
Change-Id: I51bff0a128546085e9418682b540d92eacfdbbe4
Reviewed-by: Joerg Bornemann <[email protected]>
    @alcroito
    alcroito committed May 14, 2025
    Configuration menu
    Copy the full SHA
    3db537e View commit details
    Browse the repository at this point in the history

  7. wasm: set focus to m_canvas instead of m_window 

    Setting focus and contentEditable on m_window causes
innerHTML to build up with characters.

This does not happen when using the m_canvas

The downside is that m_canvas is aria-hidden, but this
should, in principle, not be a problem since
m_canvas should not be focused when a11y is in
effect.

Later aria-hidden might be set only if a11y is in
effect.

This is a candidate for manual cherry-picking to
6.9 6.9.1

Task-number: QTBUG-136687
Change-Id: I08a9db2c39f9b0b0038c75fd06d3504b736ea031
Reviewed-by: Morten Johan Sørvig <[email protected]>
    @EvenOAndersen
    EvenOAndersen committed May 14, 2025
    Configuration menu
    Copy the full SHA
    8391685 View commit details
    Browse the repository at this point in the history

  8. Clarify QFuture::isValid() docs 

    It was not clear that the function will return true even when the
result is not yet ready, so mention it explicitly.

Amends 44ceb56.

Fixes: QTBUG-136530
Pick-to: 6.9 6.8 6.5
Change-Id: I03b79f2b28c4bb755e6f56147cc7af1413ed4e57
Reviewed-by: Edward Welbourne <[email protected]>
    @isolovev
    isolovev committed May 14, 2025
    Configuration menu
    Copy the full SHA
    a7d8d3e View commit details
    Browse the repository at this point in the history

  9. WindowsQPA: Make custom titlebar respect swapped mouse buttons 

    Custom titlebar input handling is done on WM_NCHITTEST, which is handled
at the WinAPI level. The WinAPI does not take into account the swapped
mouse buttons when querying the state of VK_LEFTBUTTON and
VK_RIGHTBUTTON with GetAsyncKeyState, so this behavior has to be
implemented manually. In case of swapped mouse buttons,
GetSystemMetrics(SM_SWAPBUTTON) will return true. This patch inverses
the meaning of Right and Left buttons in case
GetSystemMetrics(SM_SWAPBUTTON) returns true.

Pick-to: 6.9
Change-Id: Ie46e130dc0bb49de318c8d04a3cc426f7a346b5b
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Zhao Yuhang <[email protected]>
    Wladimir Leuschner committed May 14, 2025
    Configuration menu
    Copy the full SHA
    6273e2e View commit details
    Browse the repository at this point in the history

  10. ensurePositionTopLeft - always return true on Android 

    Due to synchronous position handling, it is not necessary to wait for
event based geometry updates.

Always return true on Android.

Change-Id: Iad1da66e38b2ec1193c5569b4d1764c7202ea319
Reviewed-by: Axel Spoerl <[email protected]>
    Frédéric Lefebvre committed May 14, 2025
    Configuration menu
    Copy the full SHA
    26fc2b4 View commit details
    Browse the repository at this point in the history
Loading