Merge integration refs/builds/qtci/dev/1618592683

blockspacer · Apr 16, 2021 · 09d99a8 · 09d99a8
2 parents 5839dee + b9d0fd3
commit 09d99a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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));

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
@@ -444,7 +444,7 @@ class Q_CORE_EXPORT QMetaType {
 
     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

diff --git 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<QString>("input");
     QTest::addColumn<bool>("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;