From 70d99512eee2c1077024a5f21eca47af1066cfaf Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 16 Apr 2021 11:27:24 +0200 Subject: [PATCH 1/3] Fix call to QMessageBox::information The call assumes two arguments for QString::arg, but only one was passed. The error string became a buttontext argument, which is clearly wrong. Task-number: QTBUG-92483 Change-Id: I1fab5be88331f636185693b721f0d9688c0d9ff3 Reviewed-by: Jarek Kobus --- examples/widgets/widgets/imageviewer/imageviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 0e333b693f4..6a1072afeff 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.cpp +++ b/examples/widgets/widgets/imageviewer/imageviewer.cpp @@ -151,7 +151,7 @@ bool ImageViewer::saveFile(const QString &fileName) if (!writer.write(image)) { QMessageBox::information(this, QGuiApplication::applicationDisplayName(), tr("Cannot write %1: %2") - .arg(QDir::toNativeSeparators(fileName)), writer.errorString()); + .arg(QDir::toNativeSeparators(fileName), writer.errorString())); return false; } const QString message = tr("Wrote \"%1\"").arg(QDir::toNativeSeparators(fileName)); From bf23fc3cdc29e5129482a871324b4a145b6c18ca Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 16 Apr 2021 12:37:35 +0200 Subject: [PATCH 2/3] Make the documented API visible to qdoc Pick-to: 6.1 Change-Id: Ic511af71cd0cc202f86fd39f5a4e0707bcf9fe36 Reviewed-by: Fabian Kosmale --- src/corelib/kernel/qmetatype.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index c08a87efd95..1d039b6f18a 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -444,7 +444,7 @@ public: bool isValid() const; bool isRegistered() const; -#if defined(QT_QMETATYPE_BC_COMPAT) +#if defined(QT_QMETATYPE_BC_COMPAT) || defined(Q_QDOC) int id() const; #else // ### Qt 7: Remove traces of out of line version From b9d0fd3a09c23b410bb8ef228ff5326d118f3069 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 15 Apr 2021 18:46:45 +0200 Subject: [PATCH 3/3] tst_qcborstreamwriter: don't pass char8_t strings to QByteArray There isn't a QByteArray constructor taking a char8_t*. (I am not sure if there should be one; QByteArray is not going to anything special about that information anyways.) Change such strings to be "ordinary" narrow string literals. There should be no problems at doing so, as by default we build in UTF-8 mode under all compilers. Pick-to: 6.1 6.0 Change-Id: Ia200ec6e3b0453bad033d5d8ff34c013bb27abd1 Reviewed-by: Thiago Macieira --- .../serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp index cf717aaad5d..b32a2b4d73c 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp +++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp @@ -193,7 +193,7 @@ void tst_QCborStreamWriter::nonAsciiStrings_data() QTest::addColumn("input"); QTest::addColumn("isLatin1"); - QByteArray latin1 = u8"Résumé"; + QByteArray latin1 = "Résumé"; QTest::newRow("shortlatin1") << ("\x68" + latin1) << QString::fromUtf8(latin1) << true; @@ -202,7 +202,7 @@ void tst_QCborStreamWriter::nonAsciiStrings_data() QTest::newRow("longlatin1") << ("\x78\x28" + latin1) << QString::fromUtf8(latin1) << true; - QByteArray nonlatin1 = u8"Χαίρετε"; + QByteArray nonlatin1 = "Χαίρετε"; QTest::newRow("shortnonlatin1") << ("\x6e" + nonlatin1) << QString::fromUtf8(nonlatin1) << false;