diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-15 11:51:27 +0200 |
---|---|---|
committer | cherrypickbot <cherrypickbot@codereview.qt-project.org> | 2020-04-15 11:32:38 +0000 |
commit | 1b992406a6523a144c58baa9bbd1198bb9a2d98c (patch) | |
tree | 4c5aab2dd31de806a30ba0858b2e24f403ae1898 | |
parent | 78e8a23e171569d231c3b8cd14fddef1e9b10a34 (diff) | |
download | qttools-1b992406a6523a144c58baa9bbd1198bb9a2d98c.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]
Cherry-picked from branch: dev
Change-Id: I103a28bd6ce97de311042f145d4a793be9d4b9a7
Reviewed-by: cherrypickbot
-rw-r--r-- | examples/assistant/simpletextviewer/findfiledialog.cpp | 2 | ||||
-rw-r--r-- | tests/auto/linguist/lupdate/tst_lupdate.cpp | 26 | ||||
-rw-r--r-- | tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp | 5 | ||||
-rw-r--r-- | tests/auto/qtdiag/tst_qtdiag.cpp | 2 |
4 files changed, 18 insertions, 17 deletions
diff --git a/examples/assistant/simpletextviewer/findfiledialog.cpp b/examples/assistant/simpletextviewer/findfiledialog.cpp index cf64e9a6a..bb47ae4fd 100644 --- a/examples/assistant/simpletextviewer/findfiledialog.cpp +++ b/examples/assistant/simpletextviewer/findfiledialog.cpp @@ -182,7 +182,7 @@ void FindFileDialog::createComboBoxes() directoryComboBox->setMinimumContentsLength(30); directoryComboBox->setSizeAdjustPolicy( - QComboBox::AdjustToMinimumContentsLength); + QComboBox::AdjustToContents); directoryComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index 0837ee572..ac6e4db2b 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -240,7 +240,7 @@ void tst_lupdate::good() QString workDir = dir; QStringList generatedtsfiles(QLatin1String("project.ts")); - QString lupdatecmd; + QStringList lupdateArguments; QFile file(dir + "/lupdatecmd"); if (file.exists()) { @@ -250,8 +250,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); @@ -280,29 +280,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; diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp index 7789ad5f7..59c6fcb78 100644 --- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp +++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp @@ -105,11 +105,12 @@ void tst_qtattributionsscanner::test() dir = QFileInfo(dir).absolutePath(); QProcess proc; - QString command = m_cmd + " " + dir + " --output-format json"; + const QStringList arguments{dir, "--output-format", "json"}; + QString command = m_cmd + ' ' + arguments.join(' '); QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert("QT_ATTRIBUTIONSSCANNER_TEST", "1"); proc.setProcessEnvironment(env); - proc.start(command, QIODevice::ReadWrite | QIODevice::Text); + proc.start(m_cmd, arguments, QIODevice::ReadWrite | QIODevice::Text); QVERIFY2(proc.waitForStarted(), qPrintable(command + QLatin1String(" :") + proc.errorString())); QVERIFY2(proc.waitForFinished(30000), qPrintable(command)); diff --git a/tests/auto/qtdiag/tst_qtdiag.cpp b/tests/auto/qtdiag/tst_qtdiag.cpp index 207c450c2..d120b0fa9 100644 --- a/tests/auto/qtdiag/tst_qtdiag.cpp +++ b/tests/auto/qtdiag/tst_qtdiag.cpp @@ -67,7 +67,7 @@ void tst_QtDiag::run() QSKIP("Binary could not be found"); QProcess process; qDebug() << "Launching " << QDir::toNativeSeparators(m_binary); - process.start(m_binary); + process.start(m_binary, QStringList{}); QVERIFY2(process.waitForStarted(), qPrintable(process.errorString())); QVERIFY(process.waitForFinished()); QCOMPARE(process.exitStatus(), QProcess::NormalExit); |