diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-10 11:54:52 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-10-10 11:54:52 +0300 |
| commit | 45164a9c4fd74fe4fb85bbda61c82caa46f31492 (patch) | |
| tree | 0c3c99ccf3de7dbf1989b4ddffaac08c80d8cdd3 | |
| parent | 07efb0eca9ade2fe7dca843161b177b41387d209 (diff) | |
| parent | 228243b0f03257e2664bb741d6d05ba1dd592a2c (diff) | |
Merge tag 'v6.5.7-lts' into tqtc/lts-6.5-opensourcev6.5.7-lts-lgpl6.5
Qt 6.5.7-lts release
Conflicts solved:
dependencies.yaml
Change-Id: Icaa24ecb086c1dc2c0701dd757514833a62dcefc
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | tests/auto/qdeclarativepositionsource/tst_qdeclarativepositionsource.cpp | 10 |
3 files changed, 5 insertions, 13 deletions
diff --git a/.cmake.conf b/.cmake.conf index 1a963982..4880c96a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.5.6") +set(QT_REPO_MODULE_VERSION "6.5.7") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") diff --git a/dependencies.yaml b/dependencies.yaml index 48906d5a..f8d35fb1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../tqtc-qtbase: - ref: 5d8e9a8415562ba004b38508d91e1fa0254c17d3 + ref: fc0e66eefe3a08428ca4a6e92c66f37ac126d3c4 required: true ../tqtc-qtdeclarative: - ref: ff0a47c8f267e905113b82c53af2742027f0eca6 + ref: 844f9b9b376838bcb44324984876f8bf99d85d38 required: false ../tqtc-qtserialport: - ref: 0dad57c1367382dee9d27396dc7ea4ac012e6ff0 + ref: 1ccdc50a360cbd0235632e445a014ca75cfebb84 required: false diff --git a/tests/auto/qdeclarativepositionsource/tst_qdeclarativepositionsource.cpp b/tests/auto/qdeclarativepositionsource/tst_qdeclarativepositionsource.cpp index 00e3fe1d..a87c96c9 100644 --- a/tests/auto/qdeclarativepositionsource/tst_qdeclarativepositionsource.cpp +++ b/tests/auto/qdeclarativepositionsource/tst_qdeclarativepositionsource.cpp @@ -98,15 +98,7 @@ static char *printPosition(const QDeclarativePosition *position) { // For this test we need to print only coordinate, so that we get a nice // error message if the below test fails. - QString str; - QDebug dbg(&str); - dbg << position->coordinate(); - const auto dataArray = str.toLatin1(); - const auto msgSize = dataArray.size() + 1; - char *msg = new char[msgSize]; - memset(msg, 0, msgSize); - qsnprintf(msg, msgSize, "%s", dataArray.constData()); - return msg; + return qstrdup(QDebug::toString(position->coordinate()).toLatin1().constData()); } void tst_DeclarativePositionSource::positionBinding() |