Merge lp:~mzanetti/ubuntu-touch-tweak-tool/desktop-file-charset into lp:ubuntu-touch-tweak-tool

Proposed by Michael Zanetti
Status: Merged
Merged at revision: 80
Proposed branch: lp:~mzanetti/ubuntu-touch-tweak-tool/desktop-file-charset
Merge into: lp:ubuntu-touch-tweak-tool
Diff against target: 11 lines (+1/-0)
1 file modified
src/plugin/tweaktool/packagesmodel.cpp (+1/-0)
To merge this branch: bzr merge lp:~mzanetti/ubuntu-touch-tweak-tool/desktop-file-charset
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Approve
Review via email: mp+296490@code.launchpad.net

Commit message

Fix charset when reading .desktop files

To post a comment you must log in.
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

LGTM, thanks Michael!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/tweaktool/packagesmodel.cpp'
2--- src/plugin/tweaktool/packagesmodel.cpp 2016-05-30 17:21:32 +0000
3+++ src/plugin/tweaktool/packagesmodel.cpp 2016-06-04 09:33:12 +0000
4@@ -162,6 +162,7 @@
5 qDebug() << "Desktop file found:" << path;
6
7 QSettings appInfo(path, QSettings::IniFormat);
8+ appInfo.setIniCodec("UTF-8");
9
10 Hook appHook;
11 appHook.type = Hook::App;

Subscribers

People subscribed via source and target branches