From 6fec05296bad915e7cd3c3e369599dafd6e88548 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Mon, 29 May 2023 12:17:56 +0300
Subject: Fix endl call in macOs

Task-number: QTIFW-1829
Change-Id: I8ac001416331493a7bdc90cdeaafca034e0bbbd7
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
---
 src/libs/ifwtools/binarycreator.cpp         | 54 ++++++++++++++---------------
 src/libs/installer/packagemanagercore_p.cpp |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/libs/ifwtools/binarycreator.cpp b/src/libs/ifwtools/binarycreator.cpp
index 52603cad5..341052650 100644
--- a/src/libs/ifwtools/binarycreator.cpp
+++ b/src/libs/ifwtools/binarycreator.cpp
@@ -262,7 +262,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const Bin
             QFile pkgInfo(fi.filePath() + QLatin1String("/Contents/PkgInfo"));
             pkgInfo.open(QIODevice::WriteOnly);
             QTextStream pkgInfoStream(&pkgInfo);
-            pkgInfoStream << QLatin1String("APPL????") << endl;
+            pkgInfoStream << QLatin1String("APPL????") << Qt::endl;
         }
 
         QString iconFile;
@@ -282,44 +282,44 @@ static int assemble(Input input, const QInstaller::Settings &settings, const Bin
         QFile infoPList(fi.filePath() + QLatin1String("/Contents/Info.plist"));
         infoPList.open(QIODevice::WriteOnly);
         QTextStream plistStream(&infoPList);
-        plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << endl;
+        plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << Qt::endl;
         plistStream << QLatin1String("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
-                                     "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">") << endl;
-        plistStream << QLatin1String("<plist version=\"1.0\">") << endl;
-        plistStream << QLatin1String("<dict>") << endl;
-        plistStream << QLatin1String("\t<key>CFBundleIconFile</key>") << endl;
+                                     "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">") << Qt::endl;
+        plistStream << QLatin1String("<plist version=\"1.0\">") << Qt::endl;
+        plistStream << QLatin1String("<dict>") << Qt::endl;
+        plistStream << QLatin1String("\t<key>CFBundleIconFile</key>") << Qt::endl;
         plistStream << QLatin1String("\t<string>") << iconTargetFile << QLatin1String("</string>")
-            << endl;
-        plistStream << QLatin1String("\t<key>CFBundlePackageType</key>") << endl;
-        plistStream << QLatin1String("\t<string>APPL</string>") << endl;
+            << Qt::endl;
+        plistStream << QLatin1String("\t<key>CFBundlePackageType</key>") << Qt::endl;
+        plistStream << QLatin1String("\t<string>APPL</string>") << Qt::endl;
 #define QUOTE_(x) #x
 #define QUOTE(x) QUOTE_(x)
-        plistStream << QLatin1String("\t<key>CFBundleShortVersionString</key>") << endl;
+        plistStream << QLatin1String("\t<key>CFBundleShortVersionString</key>") << Qt::endl;
         plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>")
-            << endl;
-        plistStream << QLatin1String("\t<key>CFBundleVersion</key>") << endl;
+            << Qt::endl;
+        plistStream << QLatin1String("\t<key>CFBundleVersion</key>") << Qt::endl;
         plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>")
-            << endl;
+            << Qt::endl;
 #undef QUOTE
 #undef QUOTE_
-        plistStream << QLatin1String("\t<key>CFBundleSignature</key>") << endl;
-        plistStream << QLatin1String("\t<string>\?\?\?\?</string>") << endl;
-        plistStream << QLatin1String("\t<key>CFBundleExecutable</key>") << endl;
+        plistStream << QLatin1String("\t<key>CFBundleSignature</key>") << Qt::endl;
+        plistStream << QLatin1String("\t<string>\?\?\?\?</string>") << Qt::endl;
+        plistStream << QLatin1String("\t<key>CFBundleExecutable</key>") << Qt::endl;
         plistStream << QLatin1String("\t<string>") << fi.completeBaseName() << QLatin1String("</string>")
-            << endl;
-        plistStream << QLatin1String("\t<key>CFBundleIdentifier</key>") << endl;
-        plistStream << QLatin1String("\t<string>com.yourcompany.installerbase</string>") << endl;
-        plistStream << QLatin1String("\t<key>NOTE</key>") << endl;
+            << Qt::endl;
+        plistStream << QLatin1String("\t<key>CFBundleIdentifier</key>") << Qt::endl;
+        plistStream << QLatin1String("\t<string>com.yourcompany.installerbase</string>") << Qt::endl;
+        plistStream << QLatin1String("\t<key>NOTE</key>") << Qt::endl;
         plistStream << QLatin1String("\t<string>This file was generated by Qt Installer Framework.</string>")
-            << endl;
-        plistStream << QLatin1String("\t<key>NSPrincipalClass</key>") << endl;
-        plistStream << QLatin1String("\t<string>NSApplication</string>") << endl;
+            << Qt::endl;
+        plistStream << QLatin1String("\t<key>NSPrincipalClass</key>") << Qt::endl;
+        plistStream << QLatin1String("\t<string>NSApplication</string>") << Qt::endl;
         if (!minimumSystemVersion.isEmpty()) {
-            plistStream << QLatin1String("\t<key>LSMinimumSystemVersion</key>") << endl;
-            plistStream << QLatin1String("\t<string>") << minimumSystemVersion << QLatin1String("</string>") << endl;
+            plistStream << QLatin1String("\t<key>LSMinimumSystemVersion</key>") << Qt::endl;
+            plistStream << QLatin1String("\t<string>") << minimumSystemVersion << QLatin1String("</string>") << Qt::endl;
         }
-        plistStream << QLatin1String("</dict>") << endl;
-        plistStream << QLatin1String("</plist>") << endl;
+        plistStream << QLatin1String("</dict>") << Qt::endl;
+        plistStream << QLatin1String("</plist>") << Qt::endl;
 
         input.outputPath = QString::fromLatin1("%1/Contents/MacOS/%2").arg(input.outputPath)
             .arg(fi.completeBaseName());
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 656a1d437..8a520f297 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -1300,7 +1300,7 @@ void PackageManagerCorePrivate::writeMaintenanceToolAppBundle(OperationList &per
         const QString after = QLatin1String("<string>") + QFileInfo(maintenanceToolName()).baseName()
             + QLatin1String("</string>");
         while (!in.atEnd())
-            out << in.readLine().replace(before, after) << endl;
+            out << in.readLine().replace(before, after) << Qt::endl;
 
         // copy qt_menu.nib if it exists
         op = createOwnedOperation(QLatin1String("Mkdir"));
-- 
cgit v1.2.3