summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-11-16 17:23:30 +0200
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2021-12-21 10:16:32 +0200
commit347d9cd8525a0baadbd4822465248905877babd3 (patch)
treea9a7aa98f32008cfdc11132842fe63eb7113be05 /tests/auto
parent7ba80f53f3f493e6b66c9867a9f31cbdcf364466 (diff)
Fix deprecation warnings from building with Qt 5.15.2
Also update build version requirements. Task-number: QTIFW-2388 Change-Id: Iae1949548dda7a3b8d448228e27060efb5abd8eb Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/installer/appendfileoperation/tst_appendfileoperation.cpp2
-rw-r--r--tests/auto/installer/createdesktopentryoperation/tst_createdesktopentryoperation.cpp2
-rw-r--r--tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp2
-rw-r--r--tests/auto/installer/lib7zarchive/tst_lib7zarchive.cpp1
-rw-r--r--tests/auto/installer/linereplaceoperation/tst_linereplaceoperation.cpp2
-rw-r--r--tests/auto/installer/replaceoperation/tst_replaceoperation.cpp4
6 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/installer/appendfileoperation/tst_appendfileoperation.cpp b/tests/auto/installer/appendfileoperation/tst_appendfileoperation.cpp
index 9fbfb08e7..9eb1e2401 100644
--- a/tests/auto/installer/appendfileoperation/tst_appendfileoperation.cpp
+++ b/tests/auto/installer/appendfileoperation/tst_appendfileoperation.cpp
@@ -114,7 +114,7 @@ private slots:
QVERIFY(file.open(QIODevice::WriteOnly | QIODevice::Text));
QTextStream stream(&file);
- stream << source << flush;
+ stream << source << Qt::flush;
file.close();
AppendFileOperation op;
diff --git a/tests/auto/installer/createdesktopentryoperation/tst_createdesktopentryoperation.cpp b/tests/auto/installer/createdesktopentryoperation/tst_createdesktopentryoperation.cpp
index 32e23ea14..c73e7cc03 100644
--- a/tests/auto/installer/createdesktopentryoperation/tst_createdesktopentryoperation.cpp
+++ b/tests/auto/installer/createdesktopentryoperation/tst_createdesktopentryoperation.cpp
@@ -70,7 +70,7 @@ private:
QVERIFY(QFileInfo(entryFileName).exists());
if (QFileInfo(createDesktopEntryOp->arguments().first()).isRelative()) {
QStringList directories = QString::fromLocal8Bit(qgetenv("XDG_DATA_HOME"))
- .split(QLatin1Char(':'), QString::SkipEmptyParts);
+ .split(QLatin1Char(':'), Qt::SkipEmptyParts);
// Default path if XDG_DATA_HOME is not set
directories.append(QDir::home().absoluteFilePath(QLatin1String(".local/share")));
// Default path if run as root
diff --git a/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp b/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp
index fdbbb29bc..20e6a1a91 100644
--- a/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp
+++ b/tests/auto/installer/installiconsoperation/tst_installiconsoperation.cpp
@@ -202,7 +202,7 @@ private slots:
QString targetIconsDirectory = op.value("directory").toString();
QVERIFY(QFileInfo(targetIconsDirectory).exists());
QStringList directories = QString::fromLocal8Bit(qgetenv("XDG_DATA_HOME"))
- .split(QLatin1Char(':'), QString::SkipEmptyParts);
+ .split(QLatin1Char(':'), Qt::SkipEmptyParts);
// Default path if XDG_DATA_HOME is not set
directories.append(QDir::home().absoluteFilePath(QLatin1String(".local/share")));
// Default path if run as root
diff --git a/tests/auto/installer/lib7zarchive/tst_lib7zarchive.cpp b/tests/auto/installer/lib7zarchive/tst_lib7zarchive.cpp
index 1c9c48861..a94b0f818 100644
--- a/tests/auto/installer/lib7zarchive/tst_lib7zarchive.cpp
+++ b/tests/auto/installer/lib7zarchive/tst_lib7zarchive.cpp
@@ -47,7 +47,6 @@ private slots:
Lib7z::initSevenZ();
m_file.path = "valid";
- m_file.permissions_enum = 0;
m_file.compressedSize = 836;
m_file.uncompressedSize = 5242880;
m_file.isDirectory = false;
diff --git a/tests/auto/installer/linereplaceoperation/tst_linereplaceoperation.cpp b/tests/auto/installer/linereplaceoperation/tst_linereplaceoperation.cpp
index 762ef0211..836b3dcbd 100644
--- a/tests/auto/installer/linereplaceoperation/tst_linereplaceoperation.cpp
+++ b/tests/auto/installer/linereplaceoperation/tst_linereplaceoperation.cpp
@@ -119,7 +119,7 @@ private slots:
QVERIFY(file.open(QIODevice::WriteOnly | QIODevice::Text));
QTextStream stream(&file);
- stream << source << endl;
+ stream << source << Qt::endl;
file.close();
LineReplaceOperation op(nullptr);
diff --git a/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp b/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
index 33bd2b6c1..488a14dd1 100644
--- a/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
+++ b/tests/auto/installer/replaceoperation/tst_replaceoperation.cpp
@@ -103,7 +103,7 @@ private slots:
QTextStream stream(&file);
stream << "Lorem ipsum dolore sit amet, consectetur adipiscing elit, sed do eiusmod "
- "tempor incididunt ut labore et dolore magna aliqua." << endl;
+ "tempor incididunt ut labore et dolore magna aliqua." << Qt::endl;
file.close();
ReplaceOperation searchReplaceOperation(nullptr);
@@ -139,7 +139,7 @@ private slots:
QTextStream stream(&file);
stream << "one | 10/10/2010 | three | 1.2345 | 0.00001 "
- "| 7 | A <i>bon mot</i>." << endl;
+ "| 7 | A <i>bon mot</i>." << Qt::endl;
file.close();
ReplaceOperation searchReplaceOperation(nullptr);