From d7ada4e0d84c48ff53de9c65d101b957b68236e8 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Thu, 22 Jun 2017 14:27:58 +0300
Subject: Fix install type if --online-only passed to binarycreator

Binarycreator assumed that install type is offline if no repositories
was set although --online-only was set. However, repositories might
be set later, for example in producetkeycheck::init().

Change-Id: Idd6d0e3304974773baefe3773be7e2948704575c
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 tools/binarycreator/binarycreator.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index e74f8a18c..593110c8f 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -771,8 +771,11 @@ int main(int argc, char **argv)
         {
             QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini")
                 , QSettings::IniFormat);
-            // assume offline installer if there are no repositories
-            offlineOnly |= settings.repositories().isEmpty();
+            // assume offline installer if there are no repositories and no
+            //--online-only not set
+            offlineOnly = offlineOnly | settings.repositories().isEmpty();
+            if (onlineOnly)
+                offlineOnly = !onlineOnly;
             confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly);
         }
 
-- 
cgit v1.2.3


From 116def3cb82fa84cd9ab283773eaaa7a9d26dc6f Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Sat, 8 Jul 2017 12:30:38 -0700
Subject: Write plists in the correct format, using v1.0 and with tabs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I496446d95b5523087e3d15ab3ad7cba697dea361
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 tools/binarycreator/binarycreator.cpp | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'tools')

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 593110c8f..f94dbe324 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -154,34 +154,34 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
         infoPList.open(QIODevice::WriteOnly);
         QTextStream plistStream(&infoPList);
         plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << endl;
-        plistStream << QLatin1String("<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs"
-            "/PropertyList.dtd\">") << endl;
-        plistStream << QLatin1String("<plist version=\"0.9\">") << 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("    <key>CFBundleIconFile</key>") << endl;
-        plistStream << QLatin1String("    <string>") << iconTargetFile << QLatin1String("</string>")
+        plistStream << QLatin1String("\t<key>CFBundleIconFile</key>") << endl;
+        plistStream << QLatin1String("\t<string>") << iconTargetFile << QLatin1String("</string>")
             << endl;
-        plistStream << QLatin1String("    <key>CFBundlePackageType</key>") << endl;
-        plistStream << QLatin1String("    <string>APPL</string>") << endl;
-        plistStream << QLatin1String("    <key>CFBundleGetInfoString</key>") << endl;
+        plistStream << QLatin1String("\t<key>CFBundlePackageType</key>") << endl;
+        plistStream << QLatin1String("\t<string>APPL</string>") << endl;
+        plistStream << QLatin1String("\t<key>CFBundleGetInfoString</key>") << endl;
 #define QUOTE_(x) #x
 #define QUOTE(x) QUOTE_(x)
-        plistStream << QLatin1String("    <string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>")
+        plistStream << QLatin1String("\t<string>") << QLatin1String(QUOTE(IFW_VERSION_STR)) << ("</string>")
             << endl;
 #undef QUOTE
 #undef QUOTE_
-        plistStream << QLatin1String("    <key>CFBundleSignature</key>") << endl;
-        plistStream << QLatin1String("    <string> ???? </string>") << endl;
-        plistStream << QLatin1String("    <key>CFBundleExecutable</key>") << endl;
-        plistStream << QLatin1String("    <string>") << fi.completeBaseName() << QLatin1String("</string>")
+        plistStream << QLatin1String("\t<key>CFBundleSignature</key>") << endl;
+        plistStream << QLatin1String("\t<string>????</string>") << endl;
+        plistStream << QLatin1String("\t<key>CFBundleExecutable</key>") << endl;
+        plistStream << QLatin1String("\t<string>") << fi.completeBaseName() << QLatin1String("</string>")
             << endl;
-        plistStream << QLatin1String("    <key>CFBundleIdentifier</key>") << endl;
-        plistStream << QLatin1String("    <string>com.yourcompany.installerbase</string>") << endl;
-        plistStream << QLatin1String("    <key>NOTE</key>") << endl;
-        plistStream << QLatin1String("    <string>This file was generated by Qt Installer Framework.</string>")
+        plistStream << QLatin1String("\t<key>CFBundleIdentifier</key>") << endl;
+        plistStream << QLatin1String("\t<string>com.yourcompany.installerbase</string>") << endl;
+        plistStream << QLatin1String("\t<key>NOTE</key>") << endl;
+        plistStream << QLatin1String("\t<string>This file was generated by Qt Installer Framework.</string>")
             << endl;
-        plistStream << QLatin1String("    <key>NSPrincipalClass</key>") << endl;
-        plistStream << QLatin1String("    <string>NSApplication</string>") << endl;
+        plistStream << QLatin1String("\t<key>NSPrincipalClass</key>") << endl;
+        plistStream << QLatin1String("\t<string>NSApplication</string>") << endl;
         plistStream << QLatin1String("</dict>") << endl;
         plistStream << QLatin1String("</plist>") << endl;
 
-- 
cgit v1.2.3


From 7a01e1b682a74a937a61c4879ca195c097249594 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Mon, 24 Jul 2017 15:19:07 -0700
Subject: Fix syntax errors

Somehow a newline snuck into the wrong place, and ???? is recognized as
a trigraph, which produces a warning.

Change-Id: If948c544cba7ca880db4077bc3192332ce87ea52
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
---
 tools/binarycreator/binarycreator.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index f94dbe324..1d57b0d55 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -154,8 +154,8 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
         infoPList.open(QIODevice::WriteOnly);
         QTextStream plistStream(&infoPList);
         plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << endl;
-        plistStream << QLatin1String("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd
-\">") << 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;
@@ -171,7 +171,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
 #undef QUOTE
 #undef QUOTE_
         plistStream << QLatin1String("\t<key>CFBundleSignature</key>") << endl;
-        plistStream << QLatin1String("\t<string>????</string>") << endl;
+        plistStream << QLatin1String("\t<string>\?\?\?\?</string>") << endl;
         plistStream << QLatin1String("\t<key>CFBundleExecutable</key>") << endl;
         plistStream << QLatin1String("\t<string>") << fi.completeBaseName() << QLatin1String("</string>")
             << endl;
-- 
cgit v1.2.3