whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't clutter up the source tree with .qm files generated by testing. 

Generate the qundo*.qm files for tst_QUndo*::commandTextFormat() in
the current directory (out of source, for a shadow build) rather than
alongside the qundo*.ts from which they're derived (in the source
tree); and remove them once loaded, if that succeeds.  (On failure, we
might even want to look at them.)

Task-number: QTBUG-49081
Change-Id: I666985fa3ceb8c25c917b617d6d39141eddebb76
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
bb10
Edward Welbourne 2015-10-28 13:52:31 +01:00
parent f5ea4baa0d
commit 04def3a878
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
View File

@ -624,13 +624,13 @@ void tst_QUndoGroup::commandTextFormat()
const QString tsFile = QFINDTESTDATA("testdata/qundogroup.ts");
QVERIFY(!tsFile.isEmpty());
QVERIFY(!QProcess::execute(binDir + "/lrelease " + tsFile));
QFile::remove("qundogroup.qm"); // Avoid confusion by strays.
QVERIFY(!QProcess::execute(binDir + "/lrelease " + tsFile + " -qm qundogroup.qm"));
QTranslator translator;
const QString qmFile = QFINDTESTDATA("testdata/qundogroup.qm");
QVERIFY(!qmFile.isEmpty());
QVERIFY(translator.load(qmFile));
QVERIFY(translator.load("qundogroup.qm"));
QFile::remove("qundogroup.qm");
qApp->installTranslator(&translator);
QUndoGroup group;

8
tests/auto/widgets/util/qundostack/tst_qundostack.cpp
View File

@ -2968,12 +2968,12 @@ void tst_QUndoStack::commandTextFormat()
const QString tsFile = QFINDTESTDATA("testdata/qundostack.ts");
QVERIFY(!tsFile.isEmpty());
QVERIFY(!QProcess::execute(binDir + "/lrelease " + tsFile));
QFile::remove("qundostack.qm"); // Avoid confusion by strays.
QVERIFY(!QProcess::execute(binDir + "/lrelease " + tsFile + " -qm qundostack.qm"));
QTranslator translator;
const QString qmFile = QFINDTESTDATA("testdata/qundostack.qm");
QVERIFY(!qmFile.isEmpty());
QVERIFY(translator.load(qmFile));
QVERIFY(translator.load("qundostack.qm"));
QFile::remove("qundostack.qm");
qApp->installTranslator(&translator);
QUndoStack stack;