diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-15 11:51:27 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-15 13:01:11 +0200 |
commit | 830f1db786de48d34b16905086220a6ac28a0203 (patch) | |
tree | 16f64f2e750888680cfef10b0b497db40d4ac7ad /tests/auto/linguist | |
parent | dd9760379c83e0a2fe8b76f5a93c7e83aad55a06 (diff) | |
download | qttools-830f1db786de48d34b16905086220a6ac28a0203.tar.gz |
Fix some deprecation warnings
findfiledialog.cpp:188:24: warning: ‘AdjustToMinimumContentsLength’ is deprecated: Use AdjustToContents or AdjustToContentsOnFirstShow [-Wdeprecated-declarations]
tst_lupdate.cpp:291:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations]
tst_qtattributionsscanner.cpp:112:63: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations]
tst_qtdiag.cpp:70:27: warning: ‘void QProcess::start(const QString&, QIODevice::OpenMode)’ is deprecated: Use QProcess::start(const QString &program, const QStringList &arguments,OpenMode mode = ReadWrite) instead [-Wdeprecated-declarations]
Change-Id: I103a28bd6ce97de311042f145d4a793be9d4b9a7
Pick-to: 5.15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests/auto/linguist')
-rw-r--r-- | tests/auto/linguist/lupdate/tst_lupdate.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index c55167a55..b2ced9df8 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -237,7 +237,7 @@ void tst_lupdate::good() QString workDir = dir; QStringList generatedtsfiles(QLatin1String("project.ts")); - QString lupdatecmd; + QStringList lupdateArguments; QFile file(dir + "/lupdatecmd"); if (file.exists()) { @@ -247,8 +247,8 @@ void tst_lupdate::good() if (cmdstring.startsWith('#')) continue; if (cmdstring.startsWith("lupdate")) { - cmdstring.remove(0, 8); - lupdatecmd.append(cmdstring); + for (auto argument : cmdstring.mid(8).simplified().split(' ')) + lupdateArguments += argument; break; } else if (cmdstring.startsWith("TRANSLATION:")) { cmdstring.remove(0, 12); @@ -277,29 +277,29 @@ void tst_lupdate::good() QVERIFY(file.open(QIODevice::WriteOnly)); file.close(); - if (lupdatecmd.isEmpty()) - lupdatecmd = QLatin1String("project.pro"); - lupdatecmd.prepend("-silent "); + if (lupdateArguments.isEmpty()) + lupdateArguments.append(QLatin1String("project.pro")); + lupdateArguments.prepend("-silent"); QProcess proc; proc.setWorkingDirectory(workDir); proc.setProcessChannelMode(QProcess::MergedChannels); - const QString command = QLatin1Char('"') + m_cmdLupdate + QLatin1String("\" ") + lupdatecmd; - proc.start(command, QIODevice::ReadWrite | QIODevice::Text); + const QString command = m_cmdLupdate + ' ' + lupdateArguments.join(' '); + proc.start(m_cmdLupdate, lupdateArguments, QIODevice::ReadWrite | QIODevice::Text); QVERIFY2(proc.waitForStarted(), qPrintable(command + QLatin1String(" :") + proc.errorString())); QVERIFY2(proc.waitForFinished(30000), qPrintable(command)); - QByteArray output = proc.readAll(); + const QString output = QString::fromLocal8Bit(proc.readAll()); QVERIFY2(proc.exitStatus() == QProcess::NormalExit, - "\"lupdate " + lupdatecmd.toLatin1() + "\" crashed\n" + output); + qPrintable(QLatin1Char('"') + command + "\" crashed\n" + output)); QVERIFY2(!proc.exitCode(), - "\"lupdate " + lupdatecmd.toLatin1() + "\" exited with code " + - QByteArray::number(proc.exitCode()) + "\n" + output); + qPrintable(QLatin1Char('"') + command + "\" exited with code " + + QString::number(proc.exitCode()) + '\n' + output)); // If the file expectedoutput.txt exists, compare the // console output with the content of that file QFile outfile(dir + "/expectedoutput.txt"); if (outfile.exists()) { - QStringList errslist = QString::fromLatin1(output).split(QLatin1Char('\n')); + QStringList errslist = output.split(QLatin1Char('\n')); doCompare(errslist, outfile.fileName(), true); if (QTest::currentTestFailed()) return; |