diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2014-01-21 15:05:12 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-01-22 14:59:54 +0100 |
commit | 851bd7738b170688955ccb136105ff88ca412d9d (patch) | |
tree | f88ed7e679812170f002fb251b1cb495d49646ed | |
parent | 3dd15b486d7c6b9b17032b6edf3a4ea2ff0155dd (diff) |
move the currentDateTime to the constructor
It was crashing on Qt5 because the currentDateTime uses
QLocal::system Q_GLOBAL_STATIC which could be already deleted.
Change-Id: I10ff1b02a72baccbe0acd2d0f54e187653abaa04
Reviewed-by: Niels Weber <niels.weber@digia.com>
-rw-r--r-- | src/libs/installer/utils.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/utils.h | 1 |
2 files changed, 5 insertions, 2 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; }; } |