Wireshark-commits: [Wireshark-commits] master c07a48b: Qt: Fix profile zip import on Windows
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c07a48b6d37cf8873cc4d9ee8bda4a46247a4e6f
Submitter: "Roland Knall <rknall@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
c07a48b 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: I9627684f58f4c1da24b6eec8958a2542fe07d915
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>
Actions performed:
from ab274af SMB2: properly show reused FIDs
add c07a48b Qt: Fix profile zip import on Windows
Summary of changes:
ui/qt/export_object_dialog.cpp | 2 +-
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 +++---
5 files changed, 12 insertions(+), 12 deletions(-)
