Merge remote-tracking branch 'origin/9.0'

Change-Id: I12d510a4c4166a3938c51c7e2cbcd698903c09a6

2 files changed, 5 insertions, 6 deletions

diff --git a/tests/auto/finddebugsym/tst_finddebugsym.cpp b/tests/auto/finddebugsym/tst_finddebugsym.cpp
index c298749..fb45852 100644
--- a/tests/auto/finddebugsym/tst_finddebugsym.cpp
+++ b/tests/auto/finddebugsym/tst_finddebugsym.cpp
@@ -29,8 +29,6 @@
 
 #include "perfsymboltable.h"
 
-QFileInfo findDebugInfoFile(const QString& root, const QString& file, const QString& debugLinkString);
-
 class TestFindDebugSymbols : public QObject
 {
     Q_OBJECT
@@ -86,7 +84,8 @@ private slots:
         QFETCH(QString, file);
         QFETCH(QString, debugLinkString);
 
-        auto debugFile = findDebugInfoFile(tempDir.path() + QDir::separator(), root, file);
+        auto debugFile = PerfSymbolTable::findDebugInfoFile(
+                    tempDir.path() + QDir::separator(), root, file);
 
         QCOMPARE(debugFile.absoluteFilePath(), QFileInfo(tempDir.path() + debugLinkString).absoluteFilePath());
     }
diff --git a/tests/auto/perfdata/tst_perfdata.cpp b/tests/auto/perfdata/tst_perfdata.cpp
index 769559b..422814d 100644
--- a/tests/auto/perfdata/tst_perfdata.cpp
+++ b/tests/auto/perfdata/tst_perfdata.cpp
@@ -282,9 +282,9 @@ void TestPerfData::testFiles()
 
     const auto perfDataFile = QFINDTESTDATA(dataFile);
     QVERIFY(!perfDataFile.isEmpty() && QFile::exists(perfDataFile));
-    const auto expectedOutputFileCompressed = perfDataFile + ".expected.txt.zlib";
-    const auto expectedOutputFileUncompressed = perfDataFile + ".expected.txt";
-    const auto actualOutputFile = perfDataFile + ".actual.txt";
+    const auto expectedOutputFileCompressed = QString(perfDataFile + ".expected.txt.zlib");
+    const auto expectedOutputFileUncompressed = QString(perfDataFile + ".expected.txt");
+    const auto actualOutputFile = QString(perfDataFile + ".actual.txt");
 
     QBuffer output;
     QVERIFY(output.open(QIODevice::WriteOnly));