summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/lib7z_facade.cpp
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-05-02 16:09:59 +0200
committerNiels Weber <niels.weber@digia.com>2013-05-07 16:02:53 +0200
commit7b062bd6af86452ed231009b0c48d663ce93976a (patch)
tree7c2613e073335dc757a3cad6cfacd91264e95952 /src/libs/installer/lib7z_facade.cpp
parente3bd8afc6bda58e482771e09adf8294e75b89eff (diff)
Remove local filetime.
This leads to time being wrong by a couple of hours depending on usage of local time vs UTC. This has been deemed acceptable for now. Also skip the test failing because of that difference. Needs to be re-enabled when all time functionality has been rewritten. Change-Id: I23d78371df65878d16e0e428c9fca9387e29a908 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer/lib7z_facade.cpp')
-rw-r--r--src/libs/installer/lib7z_facade.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index a818e9a61..5459cd22b 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -277,8 +277,12 @@ QDateTime getDateTimeProperty(IInArchive* archive, int index, int propId, const
return defaultValue;
FILETIME localFileTime;
- if (!FileTimeToLocalFileTime(&fileTime, &localFileTime))
- throw SevenZipException(QObject::tr("Could not convert file time to local time"));
+#ifndef Q_OS_UNIX
+ if (!FileTimeToLocalFileTime(&fileTime, &localFileTime))
+ throw SevenZipException(QObject::tr("Could not convert file time to local time"));
+#else
+ localFileTime = fileTime;
+#endif
SYSTEMTIME st;
if (!BOOLToBool(FileTimeToSystemTime(&localFileTime, &st)))