diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-16 19:56:04 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-16 19:56:04 +0000 |
| commit | 09d99a8d5f4a0e359862b9b9463d7260ff33cea1 (patch) | |
| tree | a5d2e61b2123586493a3571bb1374f5e2740804c | |
| parent | 5839dee30fcbc3a4f3cdd4ace40ef8b2d5d96158 (diff) | |
| parent | b9d0fd3a09c23b410bb8ef228ff5326d118f3069 (diff) | |
Merge integration refs/builds/qtci/dev/1618592683
| -rw-r--r-- | examples/widgets/widgets/imageviewer/imageviewer.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.cpp b/examples/widgets/widgets/imageviewer/imageviewer.cpp index 0e333b693f..6a1072afef 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)); diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index c08a87efd9..1d039b6f18 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 diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp index cf717aaad5..b32a2b4d73 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<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; |