Commit 953dc877 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Resolved merge conflict

parents 9ffb83f1 c56b981f
......@@ -279,4 +279,8 @@
<binary>khelpcenter</binary>
</provides>
<launchable type="desktop-id">org.kde.Help.desktop</launchable>
<releases>
<release version="5.7.5.19121" date="2020-01-09"/>
<release version="5.7.5.19120" date="2019-12-12"/>
</releases>
</component>
......@@ -203,11 +203,13 @@ void View::lastSearch()
void View::slotIncFontSizes()
{
setFontScaleFactor( fontScaleFactor() + m_fontScaleStepping );
slotReload();
}
void View::slotDecFontSizes()
{
setFontScaleFactor( fontScaleFactor() - m_fontScaleStepping );
slotReload();
}
void View::showMenu( const QString& url, const QPoint& pos)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment