diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-04 15:47:50 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-03-04 15:47:50 +0200 |
| commit | 576673ace818d14fa0553a0d2c23966af59ae724 (patch) | |
| tree | 46d008b0ad5fef9283c79c2f281de8a84903fb87 | |
| parent | 735e3c4491b8a412253f56d71af215c6605f8459 (diff) | |
| parent | 5fd890a06773f2da56a723603f63f98c1be5be0d (diff) | |
Merge tag 'v6.5.5-lts-lgpl' into 6.5
Qt 6.5.5-lts-lgpl release
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 4 | ||||
| -rw-r--r-- | src/core5/text/qstringref.cpp | 73 | ||||
| -rw-r--r-- | src/imports/graphicaleffects5/GaussianBlur.qml | 2 |
4 files changed, 40 insertions, 41 deletions
diff --git a/.cmake.conf b/.cmake.conf index 55a35db..02a86df 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.4") +set(QT_REPO_MODULE_VERSION "6.5.5") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff --git a/dependencies.yaml b/dependencies.yaml index 3e718a6..7a34e83 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../tqtc-qtbase: - ref: 8ff0b254e4c3db81254782262d827f7831d15f6b + ref: fdf57f5df57e7d12cf871699d857a71acf272e0c required: true ../tqtc-qtdeclarative: - ref: 9edb471d3a35b3dc40def86c395789086edaa983 + ref: 7ac842cba18be081ac835bf40ac475ec4c47d30b required: false diff --git a/src/core5/text/qstringref.cpp b/src/core5/text/qstringref.cpp index ec84009..d24858a 100644 --- a/src/core5/text/qstringref.cpp +++ b/src/core5/text/qstringref.cpp @@ -881,9 +881,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs = Qt::CaseSensitive) \since 4.5 - Compares the string \a s1 with the string \a s2 and returns an - integer less than, equal to, or greater than zero if \a s1 - is less than, equal to, or greater than \a s2. + Compares \a s1 with \a s2 and returns a negative + integer if \a s1 is less than \a s2, a positive integer if it is greater + than \a s2, and zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -894,9 +894,9 @@ QStringRef QStringRef::appendTo(QString *string) const \since 4.5 \overload - Compares the string \a s1 with the string \a s2 and returns an - integer less than, equal to, or greater than zero if \a s1 - is less than, equal to, or greater than \a s2. + Compares \a s1 with \a s2 and returns a negative + integer if \a s1 is less than \a s2, a positive integer if it is greater + than \a s2, and zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -907,9 +907,9 @@ QStringRef QStringRef::appendTo(QString *string) const \since 4.5 \overload - Compares the string \a s1 with the string \a s2 and returns an - integer less than, equal to, or greater than zero if \a s1 - is less than, equal to, or greater than \a s2. + Compares \a s1 with \a s2 and returns a negative + integer if \a s1 is less than \a s2, a positive integer if it is greater + than \a s2, and zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -920,9 +920,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(const QString &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 4.5 - Compares this string with the \a other string and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other string. + Compares \c {*this} with \a other and returns a negative integer if + \c {*this} is less than \a other, a positive integer if it is greater + than \a other, and zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -935,9 +935,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(const QStringRef &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 4.5 - Compares this string with the \a other string and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other string. + Compares \c {*this} with \a other and returns a negative integer if + \c {*this} is less than \a other, a positive integer if it is greater + than \a other, and zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -950,9 +950,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 5.14 - Compares this string with \a ch and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than \a ch, interpreted as a string of length one. + Compares \c {*this} with \a ch and returns a negative integer if \c {*this} + is less than \a ch, a positive integer if it is greater than \a ch, and zero + if they are equal. Here, \a ch interpreted as a string of length one. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -963,9 +963,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 4.5 - Compares this string with the \a other string and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other string. + Compares \c {*this} with \a other and returns a negative integer if \c {*this} + is less than \a other, a positive integer if it is greater than \a other, and + zero if they are equal. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -978,10 +978,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::compare(const QByteArray &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 5.8 - Compares this string with \a other and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other byte array, - interpreted as a UTF-8 sequence. + Compares \c {*this} with \a other and returns a negative integer if \c {*this} + is less than \a other, a positive integer if it is greater than \a other, and + zero if they are equal. The contents of \a other is interpreted as UTF-8. If \a cs is Qt::CaseSensitive, the comparison is case sensitive; otherwise the comparison is case insensitive. @@ -993,9 +992,9 @@ QStringRef QStringRef::appendTo(QString *string) const \fn int QStringRef::localeAwareCompare(const QStringRef &s1, const QString & s2) \since 4.5 - Compares \a s1 with \a s2 and returns an integer less than, equal - to, or greater than zero if \a s1 is less than, equal to, or - greater than \a s2. + Compares \a s1 with \a s2 and returns a negative + integer if \a s1 is less than \a s2, a positive integer if it is greater + than \a s2, and zero if they are equal. The comparison is performed in a locale- and also platform-dependent manner. Use this function to present sorted @@ -1009,9 +1008,9 @@ QStringRef QStringRef::appendTo(QString *string) const \since 4.5 \overload - Compares \a s1 with \a s2 and returns an integer less than, equal - to, or greater than zero if \a s1 is less than, equal to, or - greater than \a s2. + Compares \a s1 with \a s2 and returns a negative + integer if \a s1 is less than \a s2, a positive integer if it is greater + than \a s2, and zero if they are equal. The comparison is performed in a locale- and also platform-dependent manner. Use this function to present sorted @@ -1025,9 +1024,9 @@ QStringRef QStringRef::appendTo(QString *string) const \since 4.5 \overload - Compares this string with the \a other string and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other string. + Compares \c {*this} with \a other and returns a negative integer if \c {*this} + is less than \a other, a positive integer if it is greater than \a other, and + zero if they are equal. The comparison is performed in a locale- and also platform-dependent manner. Use this function to present sorted @@ -1041,9 +1040,9 @@ QStringRef QStringRef::appendTo(QString *string) const \since 4.5 \overload - Compares this string with the \a other string and returns an - integer less than, equal to, or greater than zero if this string - is less than, equal to, or greater than the \a other string. + Compares \c {*this} with \a other and returns a negative integer if \c {*this} + is less than \a other, a positive integer if it is greater than \a other, and + zero if they are equal. The comparison is performed in a locale- and also platform-dependent manner. Use this function to present sorted diff --git a/src/imports/graphicaleffects5/GaussianBlur.qml b/src/imports/graphicaleffects5/GaussianBlur.qml index a226040..c7fb0f8 100644 --- a/src/imports/graphicaleffects5/GaussianBlur.qml +++ b/src/imports/graphicaleffects5/GaussianBlur.qml @@ -127,7 +127,7 @@ Item { too small deviation values makes the effect insignificant for the pixels near the radius. - \inlineimage GaussianBlur_deviation_graph.png + \image GaussianBlur_deviation_graph.png \caption The image above shows the Gaussian function with two different deviation values, yellow (1) and cyan (2.7). The y-axis shows the weights, the x-axis shows the pixel distance. |