office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-13 21:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Albert Astals Cid 2020-12-06 19:13:23 +01:00
parent e200d90de2 4f2c2b2714
commit d9487fc764
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/document.cpp
View file

@ -762,14 +762,14 @@ QUrl DocumentPrivate::giveAbsoluteUrl(const QString &fileName) const
bool DocumentPrivate::openRelativeFile(const QString &fileName)
{
QUrl url = giveAbsoluteUrl(fileName);
if (url.isEmpty())
const QUrl newUrl = giveAbsoluteUrl(fileName);
if (newUrl.isEmpty())
return false;
qCDebug(OkularCoreDebug).nospace() << "openRelativeFile: '" << url << "'";
qCDebug(OkularCoreDebug).nospace() << "openRelativeFile: '" << newUrl << "'";
emit m_parent->openUrl(url);
return true;
emit m_parent->openUrl(newUrl);
return m_url == newUrl;
}
Generator *DocumentPrivate::loadGeneratorLibrary(const KPluginMetaData &service)