URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=58e92b6a1a84ac87bd9ccb355aed04687283b2f1
Submitter: "Tomasz Moń <desowin@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark
Commits:
58e92b6a by Tomasz Moń (desowin@xxxxxxxxx):
Qt: Fix profile zip import on Windows
Do not use QDir::separator() as a directory separator. QT internally
uses "/" as separator on all systems, including Windows. The zip files
were not unzipped into target directory because splitting path on
QDir::separator() in ProfileModel::cleanName() returned only one part
(there weren't any "\' in file name, only "/").
Qt documentation for QDir::separator() mentions:
"You do not need to use this function to build file paths.
If you always use "/", Qt will translate your paths to conform to
the underlying operating system. If you want to display paths to
the user using their operating system's separator use
toNativeSeparators()."
Bug: 16410
Change-Id: I3015a1afed4407e42acdaf42182cc40aa37609d3
Reviewed-on: https://code.wireshark.org/review/36237
Petri-Dish: Tomasz Moń <desowin@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
(cherry picked from commit c07a48b6d37cf8873cc4d9ee8bda4a46247a4e6f)
Reviewed-on: https://code.wireshark.org/review/36239
Reviewed-by: Tomasz Moń <desowin@xxxxxxxxx>
Actions performed:
from b7e9a40 [Automatic update for 2020-03-01]
add 58e92b6a Qt: Fix profile zip import on Windows
Summary of changes:
ui/qt/models/filter_list_model.cpp | 2 +-
ui/qt/models/profile_model.cpp | 12 ++++++------
ui/qt/profile_dialog.cpp | 2 +-
ui/qt/utils/wireshark_zip_helper.cpp | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)