Merge remote-tracking branch 'origin/1.5'

Change-Id: Ic9f2e152046b69e38f24b51f8d7c0dc4ce17d076

5 files changed, 21 insertions, 6 deletions

diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp
index 469ba5980..61af9ae27 100644
--- a/src/libs/installer/utils.cpp
+++ b/src/libs/installer/utils.cpp
@@ -206,6 +206,7 @@ QInstaller::VerboseWriter::VerboseWriter(QObject *parent) : QObject(parent)
 {
     preFileBuffer.open(QIODevice::ReadWrite);
     stream.setDevice(&preFileBuffer);
+    currentDateTimeAsString = QDateTime::currentDateTime().toString();
 }
 
 QInstaller::VerboseWriter::~VerboseWriter()
@@ -220,8 +221,9 @@ QInstaller::VerboseWriter::~VerboseWriter()
     QFile output(logFileName);
     if (output.open(QIODevice::ReadWrite | QIODevice::Append | QIODevice::Text)) {
         QString logInfo;
-        logInfo += QLatin1String("*************************************");
-        logInfo += QLatin1String("Invoked:") + QDateTime::currentDateTime().toString();
+        logInfo += QLatin1String("************************************* Invoked: ");
+        logInfo += currentDateTimeAsString;
+        logInfo += QLatin1String("\n");
         output.write(logInfo.toLocal8Bit());
         output.write(preFileBuffer.data());
         output.close();
diff --git a/src/libs/installer/utils.h b/src/libs/installer/utils.h
index 229dfe95a..2bc7a1801 100644
--- a/src/libs/installer/utils.h
+++ b/src/libs/installer/utils.h
@@ -96,6 +96,7 @@ namespace QInstaller {
         QTextStream stream;
         QBuffer preFileBuffer;
         QString logFileName;
+        QString currentDateTimeAsString;
     };
 
 }
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index f00f7b67b..78d586560 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -50,7 +50,7 @@ template<class T>
 class SDKApp : public T
 {
 public:
-    SDKApp(int argc, char** argv)
+    SDKApp(int& argc, char** argv)
         : T(argc, argv)
         , m_console(0)
     {
diff --git a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp
index bae42fed9..5b88c0074 100644
--- a/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp
+++ b/tests/auto/installer/lib7zfacade/tst_lib7zfacade.cpp
@@ -94,7 +94,11 @@ private slots:
             QVector<Lib7z::File> files = Lib7z::listArchive(&file);
             QCOMPARE(files.count(), 1);
 #ifdef Q_OS_UNIX
-            QSKIP("This test requires the tme handling to be repaired first.", SkipSingle);
+    #if QT_VERSION < 0x050000
+            QSKIP("This test requires the time handling to be repaired first.", SkipSingle);
+    #else
+            QSKIP("This test requires the time handling to be repaired first.");
+    #endif
 #endif
             QCOMPARE(files.first(), m_file);
         }
diff --git a/tests/environmentvariable/environmentvariabletest.cpp b/tests/environmentvariable/environmentvariabletest.cpp
index c9766e619..472992214 100644
--- a/tests/environmentvariable/environmentvariabletest.cpp
+++ b/tests/environmentvariable/environmentvariabletest.cpp
@@ -60,7 +60,11 @@ EnvironmentVariableTest::EnvironmentVariableTest()
 void EnvironmentVariableTest::testPersistentNonSystem()
 {
 #ifndef Q_OS_WIN
-    QSKIP("This operation only works on Windows",SkipSingle);
+    #if QT_VERSION < 0x050000
+        QSKIP("This operation only works on Windows", SkipSingle);
+    #else
+        QSKIP("This operation only works on Windows");
+    #endif
 #endif
     KDUpdater::Application app;
     QString key = QLatin1String("IFW_TestKey");
@@ -89,7 +93,11 @@ void EnvironmentVariableTest::testPersistentNonSystem()
 void EnvironmentVariableTest::testNonPersistentNonSystem()
 {
 #ifndef Q_OS_WIN
-    QSKIP("This operation only works on Windows",SkipSingle);
+    #if QT_VERSION < 0x050000
+        QSKIP("This operation only works on Windows", SkipSingle);
+    #else
+        QSKIP("This operation only works on Windows");
+    #endif
 #endif
     KDUpdater::Application app;
     QString key = QLatin1String("IFW_TestKey");