office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-02 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/22.04'

Browse source
This commit is contained in:
Albert Astals Cid 2022-03-28 22:19:45 +02:00
parent 64676e6ff6 dbcda67ab9
commit d72d3a01a5
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
generators/chm/lib/ebook_chm.cpp
View file

@ -254,13 +254,7 @@ bool EBook_CHM::load(const QString &archiveName)
}
#if defined(WIN32)
// chm_open on Windows OS uses the following prototype:
// struct chmFile* chm_open(BSTR filename);
//
// however internally it simply passes the filename
// directly to CreateFileW function without any conversion.
// Thus we need to pass it as WCHAR * and not BSTR.
m_chmFile = chm_open((BSTR)filename.toStdWString().c_str());
m_chmFile = chm_open((BSTR)QFile::encodeName(filename).constData());
#else
m_chmFile = chm_open(QFile::encodeName(filename));
#endif