Merge remote-tracking branch 'origin/5.6' into dev

Conflicts:
	src/corelib/io/qfilesystemwatcher_win.cpp
	src/corelib/plugin/plugin.pri
	src/plugins/platforms/cocoa/qcocoaaccessibility.mm
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp

Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index b7fc382bef..02ed912323 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -619,13 +619,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 -silent " + 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;
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
index 90f29f5eb9..f21780c2c2 100644
--- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
+++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
@@ -2963,12 +2963,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 -silent " + 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;