Merge remote-tracking branch 'origin/3.1' into master

Change-Id: Icc077e3757b84b2367b2a7dd9c1e389f6845365b

1 files changed, 22 insertions, 6 deletions

diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 1cf5765e1..8ae6861a5 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -95,6 +95,22 @@ int InstallerBase::run()
         }
     }
 
+    QFile binary(binaryFile());
+
+#ifdef Q_OS_WIN
+    // On some admin user installations it is possible that the installer.dat
+    // file is left without reading permissions for non-administrator users,
+    // we should check this and prompt the user to run the executable as admin if needed.
+    if (!binary.open(QIODevice::ReadOnly)) {
+        QFileInfo binaryInfo(binary.fileName());
+        QInstaller::MessageBoxHandler::information(nullptr, QLatin1String("NoReadingPermissions"),
+            tr("Cannot open file \"%1\" for reading").arg(binaryInfo.fileName()),
+            tr("Please make sure that the current user has reading access "
+            "to file \"%1\" or try running %2 as an administrator.").arg(binaryInfo.fileName(), qAppName()));
+        return EXIT_FAILURE;
+    }
+    binary.close();
+#endif
     QString fileName = datFile(binaryFile());
     quint64 cookie = QInstaller::BinaryContent::MagicCookieDat;
     if (fileName.isEmpty()) {
@@ -102,7 +118,7 @@ int InstallerBase::run()
         cookie = QInstaller::BinaryContent::MagicCookie;
     }
 
-    QFile binary(fileName);
+    binary.setFileName(fileName);
     QInstaller::openForRead(&binary);
 
     qint64 magicMarker;
@@ -177,11 +193,11 @@ int InstallerBase::run()
     // From Qt5.8 onwards a separate command line option --proxy is not needed as system
     // proxy is used by default. If Qt is built with QT_USE_SYSTEM_PROXIES false
     // then system proxies are not used by default.
-    if ((parser.isSet(QLatin1String(CommandLineOptions::Proxy))
-#if QT_VERSION > 0x050800
-            || QNetworkProxyFactory::usesSystemConfiguration()
-#endif
-            ) && !parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) {
+    if (parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) {
+        m_core->settings().setProxyType(QInstaller::Settings::NoProxy);
+        KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
+    } else if ((parser.isSet(QLatin1String(CommandLineOptions::Proxy))
+            || QNetworkProxyFactory::usesSystemConfiguration())) {
         m_core->settings().setProxyType(QInstaller::Settings::SystemProxy);
         KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory());
     }