Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2

1 files changed, 2 insertions, 3 deletions

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index cdcbc2f4..b5e7684c 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -151,7 +151,7 @@ void SelfUpdater::testForUpdate()
       } else if (newestVer < this->m_MOVersion) {

         // this could happen if the user switches from using prereleases to

         // stable builds. Should we downgrade?

-        qDebug("this version is newer than the newest installed one: %s -> %s",

+        qDebug("This version is newer than the latest released one: %s -> %s",

                qUtf8Printable(this->m_MOVersion.displayString()),

                qUtf8Printable(newestVer.displayString()));

       }

@@ -338,9 +338,8 @@ void SelfUpdater::installUpdate()
   } else {

     reportError(tr("Failed to start %1: %2")

                     .arg(m_UpdateFile.fileName())

-                    .arg((int)res));

+                    .arg((INT_PTR)res));

   }

-

   m_UpdateFile.remove();

 }