diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-26 11:08:22 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-26 22:39:17 +0000 |
commit | 293c925a4f7500865089f23760fa46ed11585c4c (patch) | |
tree | 3c55505235aa7c1e39ece03a6b417718e39b6509 | |
parent | 252dc0d561bc4f4928cc9de1873588f31b631e33 (diff) |
Normalize download path on Windows
Task-number: QTBUG-74698
Change-Id: I3fd4b932b1d4b0ecc844818f87c1824eac1f56e6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/download_manager_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginedownloaditem/BLACKLIST | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index a22706b07..724b33a7a 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -170,7 +170,7 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(download::DownloadItem* QFileInfo suggestedFile(defaultDownloadDirectory.absoluteFilePath(suggestedFilename)); QString suggestedFilePath = suggestedFile.absoluteFilePath(); - base::FilePath tmpFilePath(toFilePathString(suggestedFilePath)); + base::FilePath tmpFilePath(toFilePath(suggestedFilePath).NormalizePathSeparatorsTo('/')); int uniquifier = base::GetUniquePathNumber(tmpFilePath, base::FilePath::StringType()); if (uniquifier > 0) diff --git a/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST b/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST index 9b3cac37e..a51117ae0 100644 --- a/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST +++ b/tests/auto/widgets/qwebenginedownloaditem/BLACKLIST @@ -1,11 +1,2 @@ -[downloadUniqueFilename] -windows - -[downloadUniqueFileNameWithTimeStamp] -windows - -[downloadToNonExistentDir] -windows - [downloadToReadOnlyDir] windows |