1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618592683

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-16 19:56:04 +00:00
commit 09d99a8d5f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/widgets/imageviewer/imageviewer.cpp
View File

@ -151,7 +151,7 @@ bool ImageViewer::saveFile(const QString &fileName)
if (!writer.write(image)) { if (!writer.write(image)) {
QMessageBox::information(this, QGuiApplication::applicationDisplayName(), QMessageBox::information(this, QGuiApplication::applicationDisplayName(),
tr("Cannot write %1: %2") tr("Cannot write %1: %2")
.arg(QDir::toNativeSeparators(fileName)), writer.errorString()); .arg(QDir::toNativeSeparators(fileName), writer.errorString()));
return false; return false;
} }
const QString message = tr("Wrote \"%1\"").arg(QDir::toNativeSeparators(fileName)); const QString message = tr("Wrote \"%1\"").arg(QDir::toNativeSeparators(fileName));

2
src/corelib/kernel/qmetatype.h
View File

@ -444,7 +444,7 @@ public:
bool isValid() const; bool isValid() const;
bool isRegistered() const; bool isRegistered() const;
#if defined(QT_QMETATYPE_BC_COMPAT) #if defined(QT_QMETATYPE_BC_COMPAT) || defined(Q_QDOC)
int id() const; int id() const;
#else #else
// ### Qt 7: Remove traces of out of line version // ### Qt 7: Remove traces of out of line version

4
tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
View File

@ -193,7 +193,7 @@ void tst_QCborStreamWriter::nonAsciiStrings_data()
QTest::addColumn<QString>("input"); QTest::addColumn<QString>("input");
QTest::addColumn<bool>("isLatin1"); QTest::addColumn<bool>("isLatin1");
QByteArray latin1 = u8"Résumé"; QByteArray latin1 = "Résumé";
QTest::newRow("shortlatin1") QTest::newRow("shortlatin1")
<< ("\x68" + latin1) << QString::fromUtf8(latin1) << true; << ("\x68" + latin1) << QString::fromUtf8(latin1) << true;
@ -202,7 +202,7 @@ void tst_QCborStreamWriter::nonAsciiStrings_data()
QTest::newRow("longlatin1") QTest::newRow("longlatin1")
<< ("\x78\x28" + latin1) << QString::fromUtf8(latin1) << true; << ("\x78\x28" + latin1) << QString::fromUtf8(latin1) << true;
QByteArray nonlatin1 = u8"Χαίρετε"; QByteArray nonlatin1 = "Χαίρετε";
QTest::newRow("shortnonlatin1") QTest::newRow("shortnonlatin1")
<< ("\x6e" + nonlatin1) << QString::fromUtf8(nonlatin1) << false; << ("\x6e" + nonlatin1) << QString::fromUtf8(nonlatin1) << false;