summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@theqtcompany.com>2015-05-06 13:10:36 +0200
committerKarsten Heimrich <karsten.heimrich@theqtcompany.com>2015-05-06 13:25:28 +0000
commite348b710240c1db744ef1a3b897dd5ebd7818a2f (patch)
tree98a0a199f0398bcb9ff91c3f98da072b862dcc71
parent82a03ab1c0aa8ac750c4d287d3e2b72dee4a1a72 (diff)
Fix auto-test build with Qt 5.5.
Still the tst_PackageManagerCore fails here cause the expected "\t" is not expanded anymore by qDebug()... Change-Id: Ia5f9383af6b32e95a198ce612c40fe0e3db2392d Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
-rw-r--r--tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp2
-rw-r--r--tests/auto/installer/repository/tst_repository.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
index 4740b60dd..6577b782c 100644
--- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
+++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
@@ -91,6 +91,7 @@ private:
void setIgnoreMessage(const QString &testDirectory)
{
const QString message = "\"\t- arguments: %1\" ";
+ QTest::ignoreMessage(QtDebugMsg, "Operations sanity check succeeded.");
QTest::ignoreMessage(QtDebugMsg, "\"backup operation: Mkdir\" ");
QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(testDirectory)));
QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(testDirectory)));
@@ -233,6 +234,7 @@ private slots:
void testRequiredDiskSpace()
{
// test installer
+ QTest::ignoreMessage(QtDebugMsg, "Operations sanity check succeeded.");
PackageManagerCore core(QInstaller::BinaryContent::MagicInstallerMarker,
QList<QInstaller::OperationBlob>());
diff --git a/tests/auto/installer/repository/tst_repository.cpp b/tests/auto/installer/repository/tst_repository.cpp
index 380d9a9a2..8d5d278a2 100644
--- a/tests/auto/installer/repository/tst_repository.cpp
+++ b/tests/auto/installer/repository/tst_repository.cpp
@@ -1,5 +1,6 @@
#include "repository.h"
+#include <QDataStream>
#include <QString>
#include <QTest>