diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
| commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
| tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /src/plugins/platforms/winrt/qwinrtfileengine.cpp | |
| parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
| parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtfileengine.cpp')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtfileengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.cpp b/src/plugins/platforms/winrt/qwinrtfileengine.cpp index dab2482ab3..58375d331c 100644 --- a/src/plugins/platforms/winrt/qwinrtfileengine.cpp +++ b/src/plugins/platforms/winrt/qwinrtfileengine.cpp @@ -426,8 +426,7 @@ QDateTime QWinRTFileEngine::fileTime(FileTime type) const ComPtr<FileProperties::IBasicProperties> properties; hr = QWinRTFunctions::await(op, properties.GetAddressOf()); RETURN_IF_FAILED("Failed to get file properties", return QDateTime()); - hr = type == ModificationTime ? properties->get_DateModified(&dateTime) - : properties->get_ItemDate(&dateTime); + hr = properties->get_DateModified(&dateTime); RETURN_IF_FAILED("Failed to get file date", return QDateTime()); } break; |